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

fix order

release_toaliyun_real
xiaohanzi 4 лет назад
Родитель
Сommit
735b60932c
4 измененных файлов: 206 добавлений и 1 удалений
  1. +200
    -0
      mallinkAdmin/src/main/resources/db/migration/V202109070001__order.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  4. +2
    -1
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 200
- 0
mallinkAdmin/src/main/resources/db/migration/V202109070001__order.sql Просмотреть файл

@@ -1023,4 +1023,204 @@ update wx_pay_order_97 set compose_order = 0 ;
update wx_pay_order_98 set compose_order = 0 ;
update wx_pay_order_99 set compose_order = 0 ;

ALTER TABLE wx_coupon_order_0 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_1 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_2 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_3 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_4 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_5 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_6 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_7 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_8 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_9 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_10 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_11 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_12 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_13 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_14 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_15 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_16 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_17 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_18 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_19 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_20 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_21 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_22 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_23 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_24 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_25 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_26 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_27 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_28 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_29 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_30 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_31 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_32 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_33 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_34 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_35 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_36 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_37 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_38 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_39 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_40 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_41 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_42 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_43 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_44 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_45 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_46 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_47 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_48 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_49 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_50 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_51 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_52 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_53 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_54 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_55 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_56 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_57 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_58 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_59 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_60 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_61 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_62 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_63 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_64 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_65 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_66 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_67 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_68 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_69 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_70 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_71 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_72 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_73 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_74 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_75 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_76 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_77 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_78 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_79 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_80 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_81 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_82 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_83 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_84 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_85 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_86 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_87 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_88 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_89 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_90 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_91 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_92 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_93 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_94 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_95 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_96 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_97 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_98 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';
ALTER TABLE wx_coupon_order_99 ADD COLUMN `coupon_number` int(8) COMMENT '购买券数量';

update wx_coupon_order_0 set coupon_number = 1;
update wx_coupon_order_1 set coupon_number = 1;
update wx_coupon_order_2 set coupon_number = 1;
update wx_coupon_order_3 set coupon_number = 1;
update wx_coupon_order_4 set coupon_number = 1;
update wx_coupon_order_5 set coupon_number = 1;
update wx_coupon_order_6 set coupon_number = 1;
update wx_coupon_order_7 set coupon_number = 1;
update wx_coupon_order_8 set coupon_number = 1;
update wx_coupon_order_9 set coupon_number = 1;
update wx_coupon_order_10 set coupon_number = 1;
update wx_coupon_order_11 set coupon_number = 1;
update wx_coupon_order_12 set coupon_number = 1;
update wx_coupon_order_13 set coupon_number = 1;
update wx_coupon_order_14 set coupon_number = 1;
update wx_coupon_order_15 set coupon_number = 1;
update wx_coupon_order_16 set coupon_number = 1;
update wx_coupon_order_17 set coupon_number = 1;
update wx_coupon_order_18 set coupon_number = 1;
update wx_coupon_order_19 set coupon_number = 1;
update wx_coupon_order_20 set coupon_number = 1;
update wx_coupon_order_21 set coupon_number = 1;
update wx_coupon_order_22 set coupon_number = 1;
update wx_coupon_order_23 set coupon_number = 1;
update wx_coupon_order_24 set coupon_number = 1;
update wx_coupon_order_25 set coupon_number = 1;
update wx_coupon_order_26 set coupon_number = 1;
update wx_coupon_order_27 set coupon_number = 1;
update wx_coupon_order_28 set coupon_number = 1;
update wx_coupon_order_29 set coupon_number = 1;
update wx_coupon_order_30 set coupon_number = 1;
update wx_coupon_order_31 set coupon_number = 1;
update wx_coupon_order_32 set coupon_number = 1;
update wx_coupon_order_33 set coupon_number = 1;
update wx_coupon_order_34 set coupon_number = 1;
update wx_coupon_order_35 set coupon_number = 1;
update wx_coupon_order_36 set coupon_number = 1;
update wx_coupon_order_37 set coupon_number = 1;
update wx_coupon_order_38 set coupon_number = 1;
update wx_coupon_order_39 set coupon_number = 1;
update wx_coupon_order_40 set coupon_number = 1;
update wx_coupon_order_41 set coupon_number = 1;
update wx_coupon_order_42 set coupon_number = 1;
update wx_coupon_order_43 set coupon_number = 1;
update wx_coupon_order_44 set coupon_number = 1;
update wx_coupon_order_45 set coupon_number = 1;
update wx_coupon_order_46 set coupon_number = 1;
update wx_coupon_order_47 set coupon_number = 1;
update wx_coupon_order_48 set coupon_number = 1;
update wx_coupon_order_49 set coupon_number = 1;
update wx_coupon_order_50 set coupon_number = 1;
update wx_coupon_order_51 set coupon_number = 1;
update wx_coupon_order_52 set coupon_number = 1;
update wx_coupon_order_53 set coupon_number = 1;
update wx_coupon_order_54 set coupon_number = 1;
update wx_coupon_order_55 set coupon_number = 1;
update wx_coupon_order_56 set coupon_number = 1;
update wx_coupon_order_57 set coupon_number = 1;
update wx_coupon_order_58 set coupon_number = 1;
update wx_coupon_order_59 set coupon_number = 1;
update wx_coupon_order_60 set coupon_number = 1;
update wx_coupon_order_61 set coupon_number = 1;
update wx_coupon_order_62 set coupon_number = 1;
update wx_coupon_order_63 set coupon_number = 1;
update wx_coupon_order_64 set coupon_number = 1;
update wx_coupon_order_65 set coupon_number = 1;
update wx_coupon_order_66 set coupon_number = 1;
update wx_coupon_order_67 set coupon_number = 1;
update wx_coupon_order_68 set coupon_number = 1;
update wx_coupon_order_69 set coupon_number = 1;
update wx_coupon_order_70 set coupon_number = 1;
update wx_coupon_order_71 set coupon_number = 1;
update wx_coupon_order_72 set coupon_number = 1;
update wx_coupon_order_73 set coupon_number = 1;
update wx_coupon_order_74 set coupon_number = 1;
update wx_coupon_order_75 set coupon_number = 1;
update wx_coupon_order_76 set coupon_number = 1;
update wx_coupon_order_77 set coupon_number = 1;
update wx_coupon_order_78 set coupon_number = 1;
update wx_coupon_order_79 set coupon_number = 1;
update wx_coupon_order_80 set coupon_number = 1;
update wx_coupon_order_81 set coupon_number = 1;
update wx_coupon_order_82 set coupon_number = 1;
update wx_coupon_order_83 set coupon_number = 1;
update wx_coupon_order_84 set coupon_number = 1;
update wx_coupon_order_85 set coupon_number = 1;
update wx_coupon_order_86 set coupon_number = 1;
update wx_coupon_order_87 set coupon_number = 1;
update wx_coupon_order_88 set coupon_number = 1;
update wx_coupon_order_89 set coupon_number = 1;
update wx_coupon_order_90 set coupon_number = 1;
update wx_coupon_order_91 set coupon_number = 1;
update wx_coupon_order_92 set coupon_number = 1;
update wx_coupon_order_93 set coupon_number = 1;
update wx_coupon_order_94 set coupon_number = 1;
update wx_coupon_order_95 set coupon_number = 1;
update wx_coupon_order_96 set coupon_number = 1;
update wx_coupon_order_97 set coupon_number = 1;
update wx_coupon_order_98 set coupon_number = 1;
update wx_coupon_order_99 set coupon_number = 1;

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java Просмотреть файл

@@ -61,6 +61,9 @@ public class WxCouponOrder extends TenantEntity {
private Integer composeOrderType;
@io.swagger.annotations.ApiModelProperty(value="组合订单编号",name="composeOrderId")
private Long composeOrderId;
@io.swagger.annotations.ApiModelProperty(value="商品数量",name="couponNumber")
private Integer couponNumber;

@TableField(exist = false)
private String couponName;


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -1067,6 +1067,7 @@ public class WxOrderServiceImpl implements WxOrderService {
}
couponOrder.setComposeOrderType(order.getComposeOrderType());
couponOrder.setComposeOrderId(order.getComposeOrderId());
couponOrder.setCouponNumber(order.getCouponNumber());

couponOrder.setFreightPrice(order.getFreightPrice());
couponOrder.setShippingType(order.getShippingType());


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

@@ -24,11 +24,12 @@
<result column="send_merchant_user_id" jdbcType="INTEGER" property="sendMerchantUserId" />
<result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType" />
<result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId" />
<result column="coupon_number" jdbcType="BIGINT" property="couponNumber" />
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`,
`verify_type`,`verify_remark`,`pay_vendor`,`send_merchant_id`,`send_merchant_user_id`,`compose_order_type`,`compose_order_id`
`verify_type`,`verify_remark`,`pay_vendor`,`send_merchant_id`,`send_merchant_user_id`,`compose_order_type`,`compose_order_id`,`coupon_number`
</sql>

<sql id="dynamicWhereConditions">


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