Selaa lähdekoodia

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

release_toaliyun_real
xiaohanzi 4 vuotta sitten
vanhempi
commit
19369257ba
11 muutettua tiedostoa jossa 58 lisäystä ja 12 poistoa
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  4. +0
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java
  5. +3
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidySource.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumPayWay.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java
  8. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  9. +16
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  10. +1
    -0
      mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java
  11. +26
    -2
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Näytä tiedosto

@@ -90,7 +90,7 @@ public class WxCouponController extends BaseController {


} }


if(!(isList == null?false:isList)){
if(!(isList == null?false:isList) && wxCoupon.getSendType() == null){
Integer[] sendTypeArray = { Integer[] sendTypeArray = {
EnumCouponSendType.ACTIVE.getCode(), EnumCouponSendType.ACTIVE.getCode(),
EnumCouponSendType.PASSIVE.getCode(),}; EnumCouponSendType.PASSIVE.getCode(),};


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java Näytä tiedosto

@@ -116,7 +116,7 @@ public class WxOrder extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private String title; private String title;


@Excel(name = "商品属性", width = 20, orderNum = "4", replace = {"消费卡_1", "优惠券_2", "砍价_3", "拼团_4","可配送商品_5", " _-1"})
@Excel(name = "商品属性", width = 20, orderNum = "4", replace = {"消费卡_1", "优惠券_2", "砍价_3", "拼团_4","可配送商品_6","券礼包_7", " _-1"})
@TableField(exist = false) @TableField(exist = false)
private Integer attribute; private Integer attribute;




+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Näytä tiedosto

@@ -93,7 +93,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@io.swagger.annotations.ApiModelProperty(value="面额",name="price") @io.swagger.annotations.ApiModelProperty(value="面额",name="price")
private Integer price; private Integer price;


@Excel(name = "所属业态", width = 50, orderNum = "11", replace = {"餐饮_1", "娱乐_2", "服饰_3", "亲子_4", "超市_5", "其它_6", "美妆_7", "珠宝_8", "服务_9", "家居_10"})
@Excel(name = "所属业态", width = 50, orderNum = "11", replace = {"餐饮_1", "娱乐_2", "服饰_3", "亲子_4", "超市_5", "其它_6", "美妆_7", "珠宝_8", "服务_9", "家居_10", "其它_"})
@io.swagger.annotations.ApiModelProperty(value = "业态", name = "business") @io.swagger.annotations.ApiModelProperty(value = "业态", name = "business")
private Integer business; private Integer business;


@@ -189,7 +189,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@TableField(exist = false) @TableField(exist = false)
private Long couponId; private Long couponId;


@Excel(name = "券类型", width = 50, orderNum = "15", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "积分券_50", "积分停车券_51", "消费卡_100"})
@Excel(name = "券类型", width = 50, orderNum = "15", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "券礼包_12", "积分券_50", "积分停车券_51", "消费卡_100"})
@TableField(exist = false) @TableField(exist = false)
private Integer couponType; private Integer couponType;




+ 0
- 1
mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java Näytä tiedosto

@@ -11,7 +11,6 @@ public enum EnumComposeOrder {
ONE_NUMBER_ORDER_BATCH(1, "购物车式组合下单,1个数量1个订单(针对同样产品)"), ONE_NUMBER_ORDER_BATCH(1, "购物车式组合下单,1个数量1个订单(针对同样产品)"),
MULITY_NUMBER_ORDER_BATCH(2,"购物车式组合下单,多个数量1个订单(针对同样产品)"), MULITY_NUMBER_ORDER_BATCH(2,"购物车式组合下单,多个数量1个订单(针对同样产品)"),
PACKAGECOUPON(3,"券包订单类型"), PACKAGECOUPON(3,"券包订单类型"),
PACKAGECOUPON_SUB(4,"券包子订单类型")
; ;


public static EnumComposeOrder getEnum(Integer code) { public static EnumComposeOrder getEnum(Integer code) {


+ 3
- 1
mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidySource.java Näytä tiedosto

@@ -10,7 +10,9 @@ public enum EnumMerchantSubsidySource {
COUPON(2, "券核销"), COUPON(2, "券核销"),
PRESS(3, "砍价核销"), PRESS(3, "砍价核销"),
GROUP(4, "拼团核销"), GROUP(4, "拼团核销"),
CASHIER(5, "收银台"),;
CASHIER(5, "收银台"),
DISTRIBUTION_GOODS(6, "可配送商品"),
GIFT_BAG(7, "券订单"),;


public static EnumMerchantSubsidySource getEnum(Integer code) { public static EnumMerchantSubsidySource getEnum(Integer code) {
for (EnumMerchantSubsidySource value : values()) { for (EnumMerchantSubsidySource value : values()) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumPayWay.java Näytä tiedosto

@@ -22,7 +22,7 @@ public enum EnumPayWay {
PAY_WAY_NOT_UNPAY_TRADE(97, "交易发券,无需支付",null,null,null), PAY_WAY_NOT_UNPAY_TRADE(97, "交易发券,无需支付",null,null,null),
PAY_WAY_NOT_UNPAY_PASSWD(98, "根据卡密兑换卡,无需支付",null,null,null), PAY_WAY_NOT_UNPAY_PASSWD(98, "根据卡密兑换卡,无需支付",null,null,null),
PAY_WAY_NOT_UNPAY_CREDIT(99, "积分兑换券,无需支付",null,null,null), PAY_WAY_NOT_UNPAY_CREDIT(99, "积分兑换券,无需支付",null,null,null),
PAY_WAY_NOT_UNPAY_GIFTLIST(100, "卷包兑换券,无需支付",null,null,null)
PAY_WAY_NOT_UNPAY_GIFTLIST(100, "卷包券,无需支付",null,null,null)
; ;


public static EnumPayWay getEnum(Integer code) { public static EnumPayWay getEnum(Integer code) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java Näytä tiedosto

@@ -368,7 +368,7 @@ public class WxCUserTagsServiceHelper{
int count = 0; int count = 0;
if(cardSpendCountList.size() > 0) { if(cardSpendCountList.size() > 0) {
for (Map<String, Object> cardSpendCount : cardSpendCountList) { for (Map<String, Object> cardSpendCount : cardSpendCountList) {
if (cardSpendCount.get("businessId").equals(b.getId().toString())) {
if (cardSpendCount.get("business_id").equals(b.getId().toString())) {
count += (Integer) cardSpendCount.get("buCount"); count += (Integer) cardSpendCount.get("buCount");
} }
} }


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Näytä tiedosto

@@ -767,6 +767,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
&& couponOrder.getCouponPrice().equals(wxCoupon.getSalePrice())) { && couponOrder.getCouponPrice().equals(wxCoupon.getSalePrice())) {
//拼团 //拼团
merchantSubsidy.setSource(EnumMerchantSubsidySource.GROUP.getCode()); merchantSubsidy.setSource(EnumMerchantSubsidySource.GROUP.getCode());
} else if(couponOrder.getCouponType().equals(EnumCouponType.COUPON_DISTRIBUTION.getCode())){
//可配送商品
merchantSubsidy.setSource(EnumMerchantSubsidySource.DISTRIBUTION_GOODS.getCode());
} else if(couponOrder.getCouponType().equals(EnumCouponType.COUPON_GIFT.getCode())){
//券礼包
merchantSubsidy.setSource(EnumMerchantSubsidySource.GIFT_BAG.getCode());
} else { } else {
//券 //券
merchantSubsidy.setSource(EnumMerchantSubsidySource.COUPON.getCode()); merchantSubsidy.setSource(EnumMerchantSubsidySource.COUPON.getCode());


+ 16
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Näytä tiedosto

@@ -1300,7 +1300,7 @@ public class WxOrderServiceImpl implements WxOrderService {


Integer composeOrderType = EnumComposeOrder.SINGLE.getCode(); Integer composeOrderType = EnumComposeOrder.SINGLE.getCode();
if(EnumPayWay.PAY_WAY_NOT_UNPAY_GIFTLIST.equals(payWay)){ if(EnumPayWay.PAY_WAY_NOT_UNPAY_GIFTLIST.equals(payWay)){
composeOrderType = EnumComposeOrder.PACKAGECOUPON_SUB.getCode();
composeOrderType = EnumComposeOrder.PACKAGECOUPON.getCode();
}else{ }else{
composeOrderType = EnumComposeOrder.SINGLE.getCode(); composeOrderType = EnumComposeOrder.SINGLE.getCode();
if (Objects.nonNull(wxCouponSendVo) && Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSendVo.getSendType())) { if (Objects.nonNull(wxCouponSendVo) && Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSendVo.getSendType())) {
@@ -1767,7 +1767,21 @@ public class WxOrderServiceImpl implements WxOrderService {


@Override @Override
public List<WxOrderCouponVo> goodsDetailCUserVo(WxOrder record) { public List<WxOrderCouponVo> goodsDetailCUserVo(WxOrder record) {
return wxOrderMapper.selectDetailOfCUser(record);
List<WxOrderCouponVo> list = wxOrderMapper.selectDetailOfCUser(record);
if(list != null && list.size() > 0){
for (WxOrderCouponVo wxOrderCouponVo:list) {
if(EnumCouponType.COUPON_GIFT.getCode().equals(wxOrderCouponVo.getType())){
WxCoupon coupon = new WxCoupon();
coupon.updateTenantInfo(wxOrderCouponVo);
List<Long> longs = JSON.parseArray(wxOrderCouponVo.getGiftList(), Long.class);
if(longs != null && longs.size() > 0){
coupon.setIds(longs);
wxOrderCouponVo.setGiftCouponList(wxCouponMapper.findList(coupon));
}
}
}
}
return list;
} }


@Override @Override


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java Näytä tiedosto

@@ -78,6 +78,7 @@ public class PayServiceFactory {
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_TRADE.getCode(), wxShareService); shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_TRADE.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_PASSWD.getCode(), wxShareService); shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_PASSWD.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT.getCode(), wxShareService); shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_GIFTLIST.getCode(), wxShareService);
} }
return shareMap; return shareMap;
} }


+ 26
- 2
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Näytä tiedosto

@@ -884,14 +884,38 @@
c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,2 attribute from wx_order o c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,2 attribute from wx_order o
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id
left join wx_coupon c on o.product_id=c.id left join wx_coupon c on o.product_id=c.id
where c.type!=100 and o.order_status in(0,1,2,3,4,5)
where c.type in (1,2,3,4,5,6,10,50,51) and o.order_status in(0,1,2,3,4,5)
<if test=" null != tenantId and '' != tenantId">
and o.`tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and o.`parent_tenant_id` = #{parentTenantId}
</if>
<!-- and ifnull(press_current_num,0)=0 and ifnull(order_group_id,0)=0 -->
union all
select o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.product_id,o.payment,o.order_status,
c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,6 attribute from wx_order o
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id
left join wx_coupon c on o.product_id=c.id
where c.type = 11 and o.order_status in(0,1,2,3,4,5)
<if test=" null != tenantId and '' != tenantId">
and o.`tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and o.`parent_tenant_id` = #{parentTenantId}
</if>
union all
select o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.product_id,o.payment,o.order_status,
c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,7 attribute from wx_order o
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id
left join wx_coupon c on o.product_id=c.id
where c.type = 12 and o.order_status in(0,1,2,3,4,5)
<if test=" null != tenantId and '' != tenantId"> <if test=" null != tenantId and '' != tenantId">
and o.`tenant_id` = #{tenantId} and o.`tenant_id` = #{tenantId}
</if> </if>
<if test=" null != parentTenantId and '' != parentTenantId"> <if test=" null != parentTenantId and '' != parentTenantId">
and o.`parent_tenant_id` = #{parentTenantId} and o.`parent_tenant_id` = #{parentTenantId}
</if> </if>
and ifnull(press_current_num,0)=0 and ifnull(order_group_id,0)=0
union all union all
select o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.product_id,o.payment, select o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.product_id,o.payment,
case o.order_status when 6 then 0 when 7 then 0 case o.order_status when 6 then 0 when 7 then 0


Ladataan…
Peruuta
Tallenna