提交 1fa418e2 authored 作者: luojie's avatar luojie

修复测试版邮箱不能发送邮件问题

上级 7b0083fe
...@@ -29,4 +29,5 @@ public class StripePay { ...@@ -29,4 +29,5 @@ public class StripePay {
chargeParams.put("source",token); chargeParams.put("source",token);
return Charge.create(chargeParams); return Charge.create(chargeParams);
} }
} }
...@@ -36,8 +36,7 @@ public class TbCfOrderController { ...@@ -36,8 +36,7 @@ public class TbCfOrderController {
} }
@ApiOperation("用户确定下单") @ApiOperation("用户确定下单")
@PostMapping("/place") @PostMapping("/place")
public Result placeOrder(@ApiParam("订单详情") @RequestBody TbCfOrderVo tbCfOrderVo,@ApiParam("发放ID") @RequestParam(value = "toitableId",required = false) String toitableId) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException { 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); return tbCfOrderService.placeOrder(tbCfOrderVo,toitableId);
} }
/** /**
...@@ -64,7 +63,6 @@ public class TbCfOrderController { ...@@ -64,7 +63,6 @@ public class TbCfOrderController {
public Result payForOrder(@ApiParam("订单id") @PathVariable("orderId") String orderId, @ApiParam("支付token") @PathVariable("token") String token) { public Result payForOrder(@ApiParam("订单id") @PathVariable("orderId") String orderId, @ApiParam("支付token") @PathVariable("token") String token) {
return tbCfOrderService.payForOrder(orderId, token); return tbCfOrderService.payForOrder(orderId, token);
} }
@ApiOperation("根据订单id,查询物流详情") @ApiOperation("根据订单id,查询物流详情")
@GetMapping("/express/{orderId}") @GetMapping("/express/{orderId}")
public Result queryOrderExpressInfo(@ApiParam("订单id") @PathVariable String orderId) throws IOException { public Result queryOrderExpressInfo(@ApiParam("订单id") @PathVariable String orderId) throws IOException {
......
package com.diaoyun.zion.chinafrica.dao; package com.diaoyun.zion.chinafrica.dao;
import com.diaoyun.zion.chinafrica.entity.*; import com.diaoyun.zion.chinafrica.entity.*;
import com.diaoyun.zion.chinafrica.vo.TbCfOrderVo;
import com.diaoyun.zion.master.dao.BaseDao; import com.diaoyun.zion.master.dao.BaseDao;
import java.util.Date; import java.util.Date;
...@@ -67,4 +68,5 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> { ...@@ -67,4 +68,5 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
*/ */
String getOrdersId(String orderId, String itemId); String getOrdersId(String orderId, String itemId);
TbCfOrderVo getOrders(String orderId);
} }
...@@ -171,4 +171,5 @@ public interface TbCfOrderService { ...@@ -171,4 +171,5 @@ public interface TbCfOrderService {
Result getDescriptionById(String descriptionId); Result getDescriptionById(String descriptionId);
} }
...@@ -173,7 +173,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -173,7 +173,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
@Override @Override
public Result placeOrder(TbCfOrderVo pageOrder, String toitableId) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException { public Result placeOrder(TbCfOrderVo pageOrder, String toitableId) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException {
System.out.println(toitableId + "发放ID");
Result<TbCfOrderVo> result = new Result<>(); Result<TbCfOrderVo> result = new Result<>();
//获取用户 //获取用户
String token = jwtTokenProvider.resolveToken(request); String token = jwtTokenProvider.resolveToken(request);
...@@ -326,6 +325,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -326,6 +325,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
return result; return result;
} }
/** /**
* 查询物流信息 * 查询物流信息
* *
...@@ -479,6 +479,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -479,6 +479,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
} }
/** /**
* 记录财务流水 * 记录财务流水
* *
......
...@@ -40,6 +40,8 @@ public class EmailHelper { ...@@ -40,6 +40,8 @@ public class EmailHelper {
String html = FreeMarkerTemplateUtils.processTemplateIntoString(t, model); String html = FreeMarkerTemplateUtils.processTemplateIntoString(t, model);
HtmlEmail email = new HtmlEmail();//创建一个HtmlEmail实例对象 HtmlEmail email = new HtmlEmail();//创建一个HtmlEmail实例对象
email.setHostName(domainProperties.getProperty("email.hostName"));//邮箱的SMTP服务器,一般123邮箱的是smtp.123.com,qq邮箱为smtp.qq.com email.setHostName(domainProperties.getProperty("email.hostName"));//邮箱的SMTP服务器,一般123邮箱的是smtp.123.com,qq邮箱为smtp.qq.com
email.setSslSmtpPort("465");
email.setSSLOnConnect(true);
email.setCharset(Consts.UTF_8.name());//设置发送的字符类型 email.setCharset(Consts.UTF_8.name());//设置发送的字符类型
//email.addTo("zhengfanguang@163.com");//设置收件人 //email.addTo("zhengfanguang@163.com");//设置收件人
email.addTo(toEmail);//设置收件人 email.addTo(toEmail);//设置收件人
......
...@@ -80,6 +80,19 @@ ...@@ -80,6 +80,19 @@
from tb_cf_order o left join tb_cf_item_order_r r on r.order_id=o.order_id from tb_cf_order o left join tb_cf_item_order_r r on r.order_id=o.order_id
where r.order_item_id = #{id} where r.order_item_id = #{id}
</select> </select>
<select id="getOrders" resultType="com.diaoyun.zion.chinafrica.entity.OrderEntity">
select
r.order_item_id order_id,
o.order_no,
o.user_name,
o.delivery_address,
o.delivery_name,
o.delivery_phone
from tb_cf_order o left join tb_cf_item_order_r r on r.order_id=o.order_id
where r.order_item_id = #{id}
</select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity"> <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
select select
`order_id`, `order_id`,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论