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

//WXORDER

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
04347f0fcc
4 измененных файлов: 218 добавлений и 4 удалений
  1. +205
    -0
      mallinkAdmin/src/main/resources/db/migration/V2023030300002__order_add_poiid.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  4. +8
    -3
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

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

@@ -0,0 +1,205 @@
ALTER TABLE `mallink`.`tt_merchant_poi`
MODIFY COLUMN `poi_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '抖音POIID' AFTER `extra`;



ALTER TABLE `mallink`.`wx_order_0`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_1`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_2`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_3`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_4`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_5`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_6`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_7`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_8`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_9`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_10`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_11`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_12`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_13`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_14`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_15`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_16`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_17`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_18`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_19`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_20`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_21`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_22`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_23`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_24`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_25`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_26`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_27`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_28`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_29`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_30`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_31`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_32`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_33`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_34`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_35`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_36`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_37`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_38`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_39`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_40`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_41`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_42`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_43`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_44`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_45`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_46`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_47`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_48`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_49`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_50`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_51`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_52`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_53`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_54`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_55`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_56`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_57`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_58`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_59`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_60`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_61`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_62`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_63`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_64`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_65`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_66`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_67`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_68`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_69`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_70`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_71`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_72`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_73`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_74`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_75`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_76`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_77`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_78`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_79`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_80`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_81`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_82`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_83`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_84`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_85`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_86`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_87`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_88`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_89`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_90`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_91`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_92`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_93`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_94`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_95`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_96`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_97`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_98`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;
ALTER TABLE `mallink`.`wx_order_99`
ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`;

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

@@ -133,6 +133,9 @@ public class WxOrder extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="额外参数,用于第三方平台",name="extParam")
private String extParam;

@io.swagger.annotations.ApiModelProperty(value = "来自(抖音来自poiId)", name = "fromId")
private String fromId;
public Object getExpParamValue(String key) {
if (StringUtils.isBlank(extParam)) {


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

@@ -3045,7 +3045,7 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setPayment(0);
record.setFormId(formId);
record.setOrderGroupId(0L);
record.setExtParam(extParam);;
record.setExtParam(extParam);

record.setShippingType(shippingType);
if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(shippingType)){
@@ -3663,6 +3663,7 @@ public class WxOrderServiceImpl implements WxOrderService {
WxOrder updOrder = new WxOrder();
updOrder.updateTenantInfo(tenantEntity);
updOrder.setId(singleOrder.getId());
updOrder.setFromId(good.getPoiId());
if (good.getItemOrderInfoList().size() == 1) {
updOrder.setExtParam(JSON.toJSONString(good.getItemOrderInfoList().get(0)));
} else {


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

@@ -37,11 +37,12 @@
<result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/>
<result column="parent_order_id" jdbcType="BIGINT" property="parentOrderId"/>
<result column="ext_param" jdbcType="VARCHAR" property="extParam"/>
<result column="from_id" jdbcType="VARCHAR" property="fromId"/>
</resultMap>

<sql id="allColumns">
`id`,`order_number`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`coupon_channel_id`,`product_id`,`product_name`,`type`,`pay_vendor`,`pay_version`,`make_merchant_id`,`payment_type`,`payment`,`payment_time`,`freight_price`,`order_status`,`cps_status`,`create_date`,`update_date`,`detail`,`ref_detail`,
`press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`total_payment`,`compose_order_id`,`coupon_number`,`compose_order_type`,`shipping_type`,`shipping_address`,`parent_order_id`,`ext_param`
`press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`total_payment`,`compose_order_id`,`coupon_number`,`compose_order_type`,`shipping_type`,`shipping_address`,`parent_order_id`,`ext_param`,`from_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -152,6 +153,10 @@
<if test=" null != parentOrderId ">
and `parent_order_id` = #{parentOrderId}
</if>

<if test=" null != fromId and '' != fromId ">
and `from_id` = #{fromId}
</if>
<if test=" null != statusS ">
and `order_status` in
@@ -336,7 +341,7 @@
<select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="BaseResultMap">
select
o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.product_name,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date,
o.compose_order_type,o.compose_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.parent_order_id,o.ext_param
o.compose_order_type,o.compose_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.parent_order_id,o.ext_param,o.from_id
from wx_order o
where o.order_status in (0,1,2,3,4,5,97)
@@ -373,7 +378,7 @@
<select id="selectDetailOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="BaseResultMap">
select
o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.product_name,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date,
o.compose_order_type,o.compose_order_id,o.parent_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.ext_param
o.compose_order_type,o.compose_order_id,o.parent_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.ext_param,o.from_id
FROM wx_order o where o.`tenant_id` = #{tenantId}
<if test="cUserId != null">
and o.c_user_id = #{cUserId}


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