Procházet zdrojové kódy

order

release_toaliyun_real
xhxu před 4 roky
rodič
revize
6ef439aaa5
5 změnil soubory, kde provedl 129 přidání a 11 odebrání
  1. +100
    -0
      mallinkAdmin/src/main/resources/db/migration/V202109020001__wx_coupon_order.sql
  2. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
  4. +8
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  5. +17
    -11
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 100
- 0
mallinkAdmin/src/main/resources/db/migration/V202109020001__wx_coupon_order.sql Zobrazit soubor

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

+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Zobrazit soubor

@@ -234,6 +234,7 @@ public class WxCouponOrderController extends BaseController {
public ResultData verify(@RequestBody Map<String, String> paramMap) {
logger.info("couponOrderController.verify:" + paramMap.toString());
String couponOrderIdStr = paramMap.get("couponOrderId");
String verifyRemark = paramMap.get("verifyRemark");
if (StringUtils.isBlank(couponOrderIdStr)) {
logger.error("couponOrderId不能为空: " + paramMap.toString());
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
@@ -305,6 +306,7 @@ public class WxCouponOrderController extends BaseController {
WxCouponOrder couponOrder = null;
try {
wxCouponOrder.setVerifyRemark(verifyRemark);
couponOrder = wxCouponOrderService.verify(wxCouponOrder, wxMerchantBUser);
} catch (MallinkException e) {
logger.error("核销异常: " + e.getMessage());


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java Zobrazit soubor

@@ -49,6 +49,8 @@ public class WxCouponOrder extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="核销类型(0:B端核销, 1:POS独立核销 2:POS交易核销)",name="verifyType")
private Integer verifyType;
@io.swagger.annotations.ApiModelProperty(value="核销类型(B端核销)",name="verifyRemark")
private String verifyRemark;
@io.swagger.annotations.ApiModelProperty(value="赠券商户编号",name="sendMerchantId")
private Long sendMerchantId;
@io.swagger.annotations.ApiModelProperty(value="赠券商户员工编号",name="sendMerchantUserId")


+ 8
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Zobrazit soubor

@@ -445,6 +445,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销
couponOrder.setBUserId(bUser.getId());
couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_B.getCode());
if(StringUtils.isNotBlank(couponOrder.getVerifyRemark())){
if(couponOrder.getVerifyRemark().equals(EnumCouponVerifyType.VERIFY_B_11.getCode().toString())){
couponOrder.setVerifyRemark(EnumCouponVerifyType.VERIFY_B_11.getMessage());
}else if(couponOrder.getVerifyRemark().equals(EnumCouponVerifyType.VERIFY_B_12.getCode().toString())){
couponOrder.setVerifyRemark(EnumCouponVerifyType.VERIFY_B_12.getMessage());
}
}
couponOrder.setUpdateDate(new Date());
num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder);
} catch (Exception e) {
@@ -1393,6 +1400,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()); //预核销
couponOrder.setBUserId(bUser.getId());
couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_B.getCode());
couponOrder.setVerifyRemark(EnumCouponVerifyType.VERIFY_B_10.getMessage());
couponOrder.setUpdateDate(new Date());
num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder);
} catch (Exception e) {


+ 17
- 11
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Zobrazit soubor

@@ -18,13 +18,14 @@
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />
<result column="auto_refund" jdbcType="INTEGER" property="autoRefund" />
<result column="verify_type" jdbcType="INTEGER" property="verifyType" />
<result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" />
<result column="pay_vendor" jdbcType="INTEGER" property="payVendor" />
<result column="send_merchant_id" jdbcType="INTEGER" property="sendMerchantId" />
<result column="send_merchant_user_id" jdbcType="INTEGER" property="sendMerchantUserId" />
</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`,`pay_vendor`,`send_merchant_id`,`send_merchant_user_id`
`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`
</sql>

<sql id="dynamicWhereConditions">
@@ -704,6 +705,7 @@
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />
<result column="pay_vendor" jdbcType="INTEGER" property="payVendor" />
<result column="verify_type" jdbcType="INTEGER" property="verifyType" />
<result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" />
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
@@ -748,6 +750,7 @@
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />
<result column="pay_vendor" jdbcType="INTEGER" property="payVendor" />
<result column="verify_type" jdbcType="INTEGER" property="verifyType" />
<result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" />

<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>

@@ -791,7 +794,7 @@
-->

co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.order_id,
co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price,
co.create_date,co.update_date,co.coupon_price, co.verify_type, co.verify_remark,co.pay_vendor,c.title,c.sale_price,c.use_price,c.price,
co.send_merchant_id,c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num,
(CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name,
(CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id,
@@ -800,7 +803,7 @@

<sql id="allAdminCouponOrderDetailColumns">
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,
co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type, co.pay_vendor,
co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark, co.pay_vendor,
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num,
bu.name, bu.phone as bphone,
cu.phone,
@@ -823,7 +826,7 @@
GROUP BY product_id) couc
RIGHT JOIN (
SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.coupon_type,
co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.auto_refund,co.verify_type,co.pay_vendor
co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.auto_refund,co.verify_type,co.verify_remark,co.pay_vendor
,co.send_merchant_id
FROM wx_coupon_order co WHERE 1=1
<if test=" null != tenantId and '' != tenantId">
@@ -952,14 +955,14 @@
</select>

<sql id="allBUserVerifiedCouponOrderColumns">
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor,
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,
bu.name,
cu.phone
</sql>

<sql id="allBUserOrderedCouponOrderColumns">
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor,
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,
cu.phone
</sql>
@@ -1010,7 +1013,7 @@
</select>

<sql id="allCouponOrderColumns">
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor
</sql>

<select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap">
@@ -1056,12 +1059,12 @@


<sql id="allCUserCouponOrderDetailColumns">
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor,
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund
</sql>

<sql id="simpleCUserCouponOrderDetailColumns">
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor
</sql>

<resultMap id="CVoResultMap" type="com.iformall.domain.vo.WxCouponOrderCVo">
@@ -1080,6 +1083,7 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />
<result column="verify_type" jdbcType="INTEGER" property="verifyType" />
<result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" />
<result column="pay_vendor" jdbcType="INTEGER" property="payVendor" />

@@ -1130,6 +1134,7 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />
<result column="verify_type" jdbcType="INTEGER" property="verifyType" />
<result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" />
<result column="pay_vendor" jdbcType="INTEGER" property="payVendor" />

<result column="type" jdbcType="INTEGER" property="type" />
@@ -1184,7 +1189,7 @@
cal.channel_type as send_channel_type
</sql> -->
<sql id="allCUserCouponOrderListColumns">
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor,
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_type,c.valid_start_date,c.valid_end_date,c.auto_refund
</sql>

@@ -1273,7 +1278,7 @@
</select>

<sql id="allCUserCouponOrderCarListColumns">
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor,
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,
json_extract(car.vendor_params,'$.id') as coupon_free_id,car.vendor_params
</sql>
@@ -1295,6 +1300,7 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />
<result column="verify_type" jdbcType="INTEGER" property="verifyType" />
<result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" />
<result column="pay_vendor" jdbcType="INTEGER" property="payVendor" />

<result column="type" jdbcType="INTEGER" property="type" />


Načítá se…
Zrušit
Uložit