提交 95eb8981 authored 作者: luojie's avatar luojie

修复订单物流查询,新增

上级 e65c294b
......@@ -34,14 +34,12 @@ public class TbCfOrderController {
public Result<TbCfOrderVo> settleAccount(@ApiParam("发放ID") @RequestParam(value = "toitableId",required = false) String toitableId) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException {
return tbCfOrderService.settleAccount(toitableId);
}
@ApiOperation("用户确定下单")
@PostMapping("/place")
public Result placeOrder(@ApiParam("订单详情") @RequestBody TbCfOrderVo tbCfOrderVo,@ApiParam("发放ID") @RequestParam(value = "toitableId",required = false) String toitableId) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException {
System.out.println("发放Id"+toitableId);
return tbCfOrderService.placeOrder(tbCfOrderVo,toitableId);
}
/**
* pageNum 页数
* pageSize 每页大小
......@@ -52,7 +50,6 @@ public class TbCfOrderController {
@ApiParam(value = "每页大小") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
@ApiParam(value = "订单状态") @RequestParam(value = "orderStatus", required = false) Integer orderStatus
) throws InterruptedException {
return tbCfOrderService.getUserOrderList(pageNum, pageSize, orderStatus);
}
......
......@@ -191,6 +191,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
tbCfItemOrderREntity.setOrderItemId(IdUtil.createIdbyUUID());
tbCfItemOrderREntity.setOrderId(definiteOrder.getOrderId());
tbCfItemOrderREntity.setItemId(itemList.getItemId());
tbCfItemOrderREntity.setIsSend(0);
tbCfItemOrderREntity.setEnableFlag(StateConstant.VALID);
tbCfItemOrderREntity.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfItemOrderREntity.setOrderStatus(OrderStatusEnum.PENDING_PAY.getValue());
......@@ -583,6 +584,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
tbCfItemOrderR.setEnableFlag(StateConstant.VALID);
tbCfItemOrderR.setItemId(tbCfCartItemDetailVo.getItemId());
tbCfItemOrderR.setOrderId(orderId);
tbCfItemOrderR.setIsSend(0);
tbCfItemOrderR.setUpdateTime(new Date());
tbCfItemOrderR.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfItemOrderR.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
......
package com.diaoyun.zion;
import java.util.Properties;
import javax.mail.Address;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import com.sun.mail.util.MailSSLSocketFactory;
public class Test {
/**
* @Title: sendEmail
* @Description: 发送邮件工具类方法
* @param sendEmail
* 发件人地址
* @param sendEmailPwd
* 授权码代替密码(更安全) 授权码的获取:进入个人邮箱,点击设置–>账户, SMTP服务选项 默认情况下这个选项是不开启的。
* 点击开启腾讯会进行身份验证,身份验证通过以后,会收到一个用于使用SMTP的16位口令,
* 验证身份的过程中把收到的口令保存下来,因为后面要使用SMTP功能必须要用到这个口令。
           阿里云企业邮箱SMTP默认开启,密码就是邮箱密码,企业邮箱服务地址是 smtp.mxhichina.com
* @param title
* 邮件标题
* @param content
* 邮件内容
* @param toEmilAddress
* 收件人地址
* @throws Exception
* @return: void
*/
public static void sendEmail(String sendEmail, String sendEmailPwd, String title, String content,
String[] toEmilAddress) throws Exception {
Properties props = new Properties();
// 开启debug调试,以便在控制台查看
//props.setProperty("mail.debug", "true");
// 设置邮件服务器主机名
props.setProperty("mail.host", "smtp.qq.com");
// 发送服务器需要身份验证
props.setProperty("mail.smtp.auth", "true");
// 发送邮件协议名称
props.setProperty("mail.transport.protocol", "smtp");
// 开启SSL加密,否则会失败
MailSSLSocketFactory sf = new MailSSLSocketFactory();
sf.setTrustAllHosts(true);
props.put("mail.smtp.ssl.enable", "true");
props.put("mail.smtp.ssl.socketFactory", sf);
Session session = Session.getInstance(props);
Message msg = new MimeMessage(session);
// 发送的邮箱地址
msg.setFrom(new InternetAddress(sendEmail));
// 设置标题
msg.setSubject(title);
// 设置内容
msg.setContent(content, "text/html;charset=gbk;");
Transport transport = session.getTransport();
// 设置服务器以及账号和密码
// 这里端口改成465
transport.connect("smtp.qq.com", sendEmail, sendEmailPwd);
// 发送到的邮箱地址
transport.sendMessage(msg, getAddress(toEmilAddress));
if(transport!=null){
try {
transport.close();
} catch (MessagingException e) {
e.printStackTrace();
}
}
}
/**
* @Title: getAddress
* @Description: 遍历收件人信息
* @param emilAddress
* @return
* @throws Exception
* @return: Address[]
*/
private static Address[] getAddress(String[] emilAddress) throws Exception {
Address[] address = new Address[emilAddress.length];
for (int i = 0; i < address.length; i++) {
address[i] = new InternetAddress(emilAddress[i]);
}
return address;
}
/**
* @Title: main
* @Description: 测试
* @param args
* @throws Exception
* @return: void
*/
public static void main(String[] args) throws Exception {
/**
* @param sendEmail 发件人地址
* @param sendEmailPwd
* 授权码代替密码(更安全)
* @param title
* 邮件标题
* @param content
* 邮件内容
* @param toEmilAddress
* 收件人地址
*/
Test.sendEmail("1203063316@qq.com", "mkwugpvzbafpjfdc", "testEmail", "testcontent",new String[]{"pure091529@163.com"});
}
}
\ No newline at end of file
......@@ -512,11 +512,11 @@ public class ZionApplicationTests {
System.out.println(it.next());
}
}
/* @Test
/* @Test
public void sendEmail() throws EmailException, TemplateException, IOException {
*//* List<String> emailList= tbCfUserInfoService.findEmails();
List<String> emailList= tbCfUserInfoService.findEmails();
for (String email:emailList){
}*//*
}
String email="1203063316@qq.com";
tbCfUserInfoService.sendRegister(email);
}*/
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论