1/9

src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java

@@ -88,10 +88,10 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
         Map<String,String> map=new HashMap<>();
 //        map.put("unionid",unionid);
         map.put("openid",openid);
-//        LpkCustomer lpkCustomer= baseMapper.selectOne(new QueryWrapper<LpkCustomer>().eq("wxMpOpenid",openid));
-        List<LpkCustomer> lpkCustomer= baseMapper.getCustomer(openid);
+        LpkCustomer lpkCustomer= baseMapper.selectOne(new QueryWrapper<LpkCustomer>().eq("wxMpOpenid",openid));
+//        List<LpkCustomer> lpkCustomer= baseMapper.getCustomer(openid);
         //查询用户是否存在
-        if(null==lpkCustomer.get(0)){
+        if(null==lpkCustomer){
             //新增用户
             LpkCustomer newCustomer=new LpkCustomer();
             newCustomer.setWxMpOpenid(openid);
@@ -108,9 +108,9 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
 //        if(StringUtils.isBlank(lpkCustomer.getMobile())){
 //            return rb.setData(lpkCustomer).setCode("110");
 //        }
-        StpUtil.login(lpkCustomer.get(0).getId());
+        StpUtil.login(lpkCustomer.getId());
         SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
-        lpkCustomer.get(0).setToken(tokenInfo.getTokenValue());
+        lpkCustomer.setToken(tokenInfo.getTokenValue());
         return rb.success().setData(lpkCustomer);
     }
     public ResultBean wxBindMobile(WxBindMobileDto wxBindMobileDto) {

src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.yyth.api.lpkcustomer.LpkCustomerVo;
 import com.yxt.yyth.api.ordorder.*;
 import com.yxt.yyth.api.ordorderdetails.OrdOrderDetail;
+import com.yxt.yyth.api.ordorderdetails.OrdOrderDetailVo;
 import com.yxt.yyth.biz.lpkcustomer.LpkCustomerService;
 import com.yxt.yyth.biz.ordorderdetails.OrdOrderDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +37,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         PayResult result=new PayResult();
         Map<String,Object>map =new HashMap<>();
         LpkCustomerVo vo= lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData();
-        Map<String, Object> sendBody=buildMessageBody( vo.getSid(), vo.getWxMpOpenid(),dto.getTotalTee(),dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size()-1)+"件商品");
+        Map<String, Object> sendBody=buildMessageBody( vo.getSid(), vo.getWxMpOpenid(),dto.getTotalTee(),dto.getOrdOrderDetailsVoList());
         ResponseEntity<ResultBean> postForEntity=new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody,ResultBean.class);
 
         ResultBean<PayOrderVo> rb1= postForEntity.getBody();
@@ -57,6 +58,8 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         order.setTotalTee(dto.getTotalTee());
         if(dto.getOrdOrderDetailsVoList().size()>1){
             order.setName(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size()-1)+"件商品");
+        }else{
+            result.setGoods(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"商品");
         }
 //        order.setName("商品");
         order.setTimeRemarks(10);
@@ -111,8 +114,14 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
     }
 
 
-    private static Map<String, Object> buildMessageBody(String userSid,String openId,String totalTee,String name){
+    private static Map<String, Object> buildMessageBody(String userSid, String openId, String totalTee, List<OrdOrderDetailVo> detailVos){
         //拼接base参数
+        String name ="";
+        if(detailVos.size()>1){
+            name=detailVos.get(0).getGoodsName().toString()+"等"+(detailVos.size()-1)+"件商品";
+        }else{
+            name =detailVos.get(0).getGoodsName().toString()+"商品";
+        }
         Map<String, Object> mp_template_msg = new HashMap<>();
         mp_template_msg.put("source", "0");
         mp_template_msg.put("totalTee", totalTee);