fix 订单

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderAddBo.java

@@ -77,6 +77,7 @@ public class OrderAddBo {
     /** 系统订单操作人 */
     @ApiModelProperty("系统订单操作人")
     private String createBy;
+    private String createUsername;
 
     /** 1有效 0无效 */
     @ApiModelProperty("1有效 0无效")

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Order.java

@@ -72,8 +72,7 @@ private static final long serialVersionUID=1L;
     /** 订单来源 1业务员录单 */
     private Integer orderFrom;
     /** 系统订单操作人 */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
+    private String createUsername;
 
     /** 1有效 0无效 */
     private Integer status;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -184,7 +184,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         add.setOrderType(Order.CONSUME_ORDER);
-
+        add.setCreateUsername(bo.getCreateBy());//
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();
 
@@ -319,7 +319,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setOrderFrom(Order.FROM_SMALL);
         add.setPayPrice(payPrice);
         add.setOrderPrice(totalPrice);
-        add.setCreateBy("");
         this.save(add);
         Map<String, Object> result = new HashMap<>();
         result.put("oderId",add.getOrderId());
@@ -327,6 +326,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         UserVo userVo = iUserService.queryById(add.getUserId());
         String price = "1";
         Map<String, String> payResult =  iWxPayService.payment(out_trade_no,userVo.getOpenId(),body,price);
+        payResult.put("orderSn",out_trade_no);
         return payResult;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -24,6 +24,7 @@ import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
 import com.zhongzheng.common.utils.polyv.PolyvUtils;
 import com.zhongzheng.common.utils.wxpay.*;
+import com.zhongzheng.modules.base.service.IShoppingCartService;
 import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.service.ICourseService;
 import com.zhongzheng.modules.exam.service.IExamNoteService;
@@ -123,6 +124,9 @@ public class WxPayServiceImpl  implements IWxPayService {
     @Autowired
     private IOrderGoodsService iOrderGoodsService;
 
+    @Autowired
+    private IShoppingCartService iShoppingCartService;
+
 
     private String gzh_tokenUrl = "https://api.weixin.qq.com/cgi-bin/token";
 
@@ -299,10 +303,12 @@ public class WxPayServiceImpl  implements IWxPayService {
                     g.setGoodsReceived(g.getGoodsRealPrice()
                     );
                     iOrderGoodsService.updateById(g);
+                    iShoppingCartService.deleteById(g.getGoodsId(),order.getUserId());
+                    System.out.println("");
                 }
             }
+
         }
-        System.out.println(System.currentTimeMillis());
         return true;
     }
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payPrice" column="pay_price"/>
         <result property="chargingType" column="charging_type"/>
         <result property="orderFrom" column="order_from"/>
-        <result property="createBy" column="create_by"/>
+        <result property="createUsername" column="create_username"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderListVo" id="OrderResultVo">