激活改成伪删除

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxJsjpController.java

@@ -109,6 +109,7 @@ public class WxJsjpController extends BaseController {
         order.setOutTradeNo(orderCode);
         order.setUserId(gzptUserInfo.getId());
         order.setUserName(gzptUserInfo.getUserName());
+        order.setLogincode(gzptUserInfo.getLogincode());
         order.setGoodsName(sysDictData.getDictLabel());
         order.setPhoneType(wxOrderDTO.getPhoneType());  //手机类型
         order.setDqbh(gzptUserInfo.getCity());

jsjp-service/src/main/java/com/miaxis/newgzpt/domain/GzptSchPayLog.java

@@ -43,6 +43,10 @@ public class GzptSchPayLog implements Serializable {
     @TableField("PRICE")
     private Integer price;
 
+    @ApiModelProperty(value = "套餐名称")
+    @TableField("goods_name")
+    private String goodsName;
+
     @ApiModelProperty(value = "驾校编号")
     @TableField("JXBH")
     private String jxbh;

jsjp-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -40,6 +40,19 @@ public class OrderInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "用户ID")
     private Long userId;
 
+    /** 用户姓名 */
+    @Excel(name = "用户姓名")
+    @TableField("user_name")
+    @ApiModelProperty(value = "用户姓名")
+    private String userName;
+
+    /** 用户登录名 */
+    @Excel(name = "用户登录名")
+    @TableField("login_code")
+    @ApiModelProperty(value = "用户登录名")
+    private String logincode;
+
+
     /** 极速驾培订单ID */
     @Excel(name = "极速驾培订单ID")
     @TableField("out_trade_no")

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -73,6 +73,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         OrderInfo orderInfo = new OrderInfo();
         orderInfo.setGoodsName(order.getGoodsName());
         orderInfo.setUserId(order.getUserId());
+        orderInfo.setUserName(order.getUserName());
+        orderInfo.setLogincode(order.getLogincode());
         orderInfo.setOutTradeNo(order.getOutTradeNo());
         orderInfo.setTotal(order.getTotal());
         orderInfo.setTradeType(1);
@@ -1737,6 +1739,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         schPayLog.setJxbh(order.getSchool());
         schPayLog.setCrtime(new Date());
         schPayLog.setState(state); // 1充值  2退款
+        schPayLog.setGoodsName(order.getGoodsName());
         schPayLogService.saveSchPayLog(schPayLog);
     }
 

jsjp-service/src/main/java/com/miaxis/wx/domain/WxJsOrder.java

@@ -42,7 +42,13 @@ public class WxJsOrder extends BaseBusinessEntity{
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
-    /** 商品名称 */
+    /** 用户登录名 */
+    @Excel(name = "用户登录名")
+    @TableField("logincode")
+    @ApiModelProperty(value = "用户登录名")
+    private String logincode;
+
+    /** 用户姓名 */
     @Excel(name = "用户姓名")
     @TableField("user_name")
     @ApiModelProperty(value = "用户姓名")

jsjp-service/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -8,6 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="goodsName"    column="goods_name"    />
         <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="logincode"    column="logincode"    />
         <result property="outTradeNo"    column="out_trade_no"    />
         <result property="outRefundNo"    column="out_refund_no"    />
         <result property="tradeType"    column="trade_type"    />

jsjp-service/src/main/resources/mapper/wx/WxJsOrderMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsName"    column="goods_name"    />
         <result property="userId"    column="user_id"    />
         <result property="userName"    column="user_name"    />
+        <result property="logincode"    column="logincode"    />
         <result property="outTradeNo"    column="out_trade_no"    />
         <result property="outRefundNo"    column="out_refund_no"    />
         <result property="refundReason"    column="refund_reason"    />
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="userId!=null"> and user_id = #{userId}</if>
             <if test="userName!=null and userName!=''"> and w.user_name = #{userName}</if>
+            <if test="logincode!=null and logincode!=''"> and w.logincode = #{logincode}</if>
             <if test="outTradeNo != null and outTradeNo!=''"> and w.out_trade_no = #{outTradeNo}</if>
             <if test="transactionId != null  and transactionId != ''"> and w.transaction_id = #{transactionId}</if>
             <if test="tradeType != null  and tradeType != ''"> and w.trade_type = #{tradeType}</if>