Просмотр исходного кода

Merge branch 'release_real_202010' of https://git.malls.iformall.com/server/formallProject into release_real_202010

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
98088cf509
2 измененных файлов: 3 добавлений и 2 удалений
  1. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml

+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Просмотреть файл

@@ -483,6 +483,7 @@ public class WxOrderController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常");
} }
wxOrder.setId(id); wxOrder.setId(id);
wxOrder.updateTenantInfo(getTenantInfo());
try { try {
final WxOrderCouponPressVo orderCouponPressVo = wxOrderService.detailPressVo(wxOrder); final WxOrderCouponPressVo orderCouponPressVo = wxOrderService.detailPressVo(wxOrder);
if (orderCouponPressVo == null) { if (orderCouponPressVo == null) {


+ 2
- 2
mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml Просмотреть файл

@@ -9,8 +9,8 @@
<result column="coupon_id" jdbcType="BIGINT" property="couponId"/> <result column="coupon_id" jdbcType="BIGINT" property="couponId"/>
<result column="remain_people" jdbcType="INTEGER" property="remainPeople"/> <result column="remain_people" jdbcType="INTEGER" property="remainPeople"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="expired_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
<result column="expired_date" jdbcType="TIMESTAMP" property="expiredDate"/>
<result column="status" jdbcType="SMALLINT" property="status"/> <result column="status" jdbcType="SMALLINT" property="status"/>
<result column="user_id" jdbcType="BIGINT" property="userId"/> <result column="user_id" jdbcType="BIGINT" property="userId"/>


Загрузка…
Отмена
Сохранить