Explorar el Código

fix

release_toaliyun_real
winter hace 2 años
padre
commit
31a15c8656
Se han modificado 5 ficheros con 22 adiciones y 3 borrados
  1. +16
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java
  2. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V20240200001.sql
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityItemRule.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml

+ 16
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java Ver fichero

@@ -7,12 +7,14 @@ import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.domain.po.WxCashBackActivity;
import com.iformall.domain.po.WxCashBackActivityItem;
import com.iformall.domain.po.WxCashBackActivityRecord;
import com.iformall.domain.po.WxCashOut;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.base.BaseEntity.SortField;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumCashBackActivityItemRule;
import com.iformall.enums.EnumCashBackActivityRecordStatus;
import com.iformall.enums.EnumCashBackActivityStatus;
import com.iformall.enums.EnumCashOutStatus;
@@ -121,6 +123,20 @@ public class WxCashBackActivityController extends BaseController {
if (null == wxCashBackActivity.getItemList() || wxCashBackActivity.getItemList().size() <= 0 ) {
return new ResultData(Result.ERROR,"规则不能为空");
}
List<WxCashBackActivityItem> itemList = wxCashBackActivity.getItemList();
for (WxCashBackActivityItem i : itemList) {
if (i.getMoneyRule().intValue() == EnumCashBackActivityItemRule.MALL_ONLY.getCode().intValue()) {
i.setMallBackRate(i.getTotalBackRate());
i.setMerchantBackRate(new BigDecimal(0));
}else if (i.getMoneyRule().intValue() == EnumCashBackActivityItemRule.MERCHANT_ONLY.getCode().intValue()) {
i.setMallBackRate(new BigDecimal(0));
i.setMerchantBackRate(i.getTotalBackRate());
}else if (i.getMoneyRule().intValue() == EnumCashBackActivityItemRule.SHARE.getCode().intValue()) {
if (i.getMallBackRate().add(i.getMerchantBackRate()).intValue() != 100) {
return new ResultData(Result.ERROR,"分担规则下,商户和商管的比例总和需要为100%");
}
}
}
if (null == wxCashBackActivity.getMerchantList() || wxCashBackActivity.getMerchantList().size() <= 0 ) {
return new ResultData(Result.ERROR,"商户不能为空");
}


+ 1
- 1
mallinkAdmin/src/main/resources/db/migration/V20240200001.sql Ver fichero

@@ -8,7 +8,7 @@ CREATE TABLE `wx_cash_back_activity` (
`status` smallint(2) NOT NULL DEFAULT '0' COMMENT '状态(0:未上架 1:已上架)',
`create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
`limit_money` int(11) NOT NULL COMMENT '最低订单金额',
`limit_money` decimal(10,3) NOT NULL COMMENT '最低订单金额',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='卡券';



+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java Ver fichero

@@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -33,7 +34,7 @@ public class WxCashBackActivity extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endTime")
private Date endTime;
@io.swagger.annotations.ApiModelProperty(value = "最低订单金额", name = "limitMoney")
private Integer limitMoney;
private BigDecimal limitMoney;
@TableField(exist = false)
private Integer validTime;


+ 2
- 0
mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityItemRule.java Ver fichero

@@ -1,5 +1,6 @@
package com.iformall.enums;

import java.math.BigDecimal;

/**
* @author gongbiao
@@ -34,4 +35,5 @@ public enum EnumCashBackActivityItemRule {
public String getMessage() {
return message;
}
}

+ 1
- 1
mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml Ver fichero

@@ -11,7 +11,7 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
<result column="limit_money" jdbcType="INTEGER" property="limitMoney" />
<result column="limit_money" jdbcType="DECIMAL" property="limitMoney" />
</resultMap>

<sql id="allColumns">


Cargando…
Cancelar
Guardar