cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

去掉去掉mq注释，修复后台发货微信用户为空的问题

Browse Source
This commit is contained in:
hupeng
2020-01-14 18:01:08 +08:00
parent 854cc843b3
commit c020c4c190
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -1407,8 +1407,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
//使用MQ延时消息 //使用MQ延时消息
//mqProducer.sendMsg("yshop-topic",storeOrder.getId().toString()); mqProducer.sendMsg("yshop-topic",storeOrder.getId().toString());
//log.info("投递延时订单id： [{}]：", storeOrder.getId()); log.info("投递延时订单id： [{}]：", storeOrder.getId());
return storeOrder; return storeOrder;
} }

33
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java
View File

@ -20,6 +20,7 @@ import co.yixiang.utils.OrderUtil;
import co.yixiang.utils.RedisUtil; import co.yixiang.utils.RedisUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -38,6 +39,7 @@ import java.util.Map;
@Api(tags = "订单管理") @Api(tags = "订单管理")
@RestController @RestController
@RequestMapping("api") @RequestMapping("api")
@Slf4j
public class YxStoreOrderController { public class YxStoreOrderController {
@Autowired @Autowired
@ -164,21 +166,26 @@ public class YxStoreOrderController {
//模板消息通知 //模板消息通知
String siteUrl = RedisUtil.get("site_url"); String siteUrl = RedisUtil.get("site_url");
YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid()); try{
if(ObjectUtil.isNotNull(wechatUser)){ YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid());
YxWechatTemplate WechatTemplate = yxWechatTemplateService if(ObjectUtil.isNotNull(wechatUser)){
.findByTempkey("OPENTM200565259"); YxWechatTemplate WechatTemplate = yxWechatTemplateService
Map<String,String> map = new HashMap<>(); .findByTempkey("OPENTM200565259");
map.put("first","亲，宝贝已经启程了，好想快点来到你身边。"); Map<String,String> map = new HashMap<>();
map.put("keyword1",resources.getOrderId());//订单号 map.put("first","亲，宝贝已经启程了，好想快点来到你身边。");
map.put("keyword2",expressDTO.getName()); map.put("keyword1",resources.getOrderId());//订单号
map.put("keyword3",resources.getDeliveryId()); map.put("keyword2",expressDTO.getName());
map.put("remark","yshop电商系统为你服务！"); map.put("keyword3",resources.getDeliveryId());
templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() map.put("remark","yshop电商系统为你服务！");
,WechatTemplate.getTempid(), templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid()
siteUrl+"/order/detail/"+resources.getOrderId(),map); ,WechatTemplate.getTempid(),
siteUrl+"/order/detail/"+resources.getOrderId(),map);
}
}catch (Exception e){
log.info("当前用户不是微信用户不能发送模板消息哦!");
} }
return new ResponseEntity(HttpStatus.NO_CONTENT); return new ResponseEntity(HttpStatus.NO_CONTENT);
} }