Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
2ac7711b8c
3 changed files with 9 additions and 4 deletions
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java
  2. +6
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java
  3. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java View File

@@ -295,7 +295,6 @@ public class WxCashBackActivityController extends BaseController {
wxCashBackActivityRecord.setOrderMoney(_r.getOrderMoney());
wxCashBackActivityService.calcuteMoney(wxCashBackActivityRecord);
}
logger.debug("wxCashBackActivityRecord >>>> "+JSON.toJSONString(wxCashBackActivityRecord));
wxCashBackActivityService.auditRecord(wxCashBackActivityRecord);
return new ResultData();
}


+ 6
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java View File

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxCashBackActivity;
import com.iformall.domain.po.WxCashBackActivityItem;
import com.iformall.domain.po.WxCashBackActivityRecord;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.base.BaseEntity.SortField;
@@ -126,6 +127,11 @@ public class WxCashBackActivityController extends BaseController {
}
}
WxCashBackActivityItem item = wxCashBackActivityService.getActivityItemById(activity.getItemId(), tenantInfo.getTenantId());
if (null != item) {
activity.setItemName(item.getName());
}
if (null != activity.getMerchantId()) {
WxMerchant m = new WxMerchant();
m.updateTenantInfo(activity);


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java View File

@@ -354,7 +354,7 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService
WxCashBackActivityItem item = wxCashBackActivityItemMapper.selectById(record.getItemId(), record.getTenantId());
EnumCashBackActivityItemRule moneyRule = EnumCashBackActivityItemRule.getEnum(item.getMoneyRule());
record.setCashRate(item.getTotalBackRate());
record.setCashMoney(record.getOrderMoney().multiply(item.getTotalBackRate()).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP));
record.setCashMoney(record.getOrderMoney().multiply(item.getTotalBackRate()).divide(new BigDecimal(100)).setScale(3,BigDecimal.ROUND_HALF_UP));
if (moneyRule == EnumCashBackActivityItemRule.MALL_ONLY) {
record.setMallCashMoney(record.getCashMoney());
record.setMerchantCashMoney(new BigDecimal(0));
@@ -362,8 +362,8 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService
record.setMallCashMoney(new BigDecimal(0));
record.setMerchantCashMoney(record.getCashMoney());
}else if (moneyRule == EnumCashBackActivityItemRule.SHARE) {
record.setMallCashMoney(record.getCashMoney().multiply(item.getMallBackRate()).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP));
record.setMerchantCashMoney(record.getCashMoney().multiply(item.getMerchantBackRate()).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP));
record.setMallCashMoney(record.getCashMoney().multiply(item.getMallBackRate()).divide(new BigDecimal(100)).setScale(3,BigDecimal.ROUND_HALF_UP));
record.setMerchantCashMoney(record.getCashMoney().multiply(item.getMerchantBackRate()).divide(new BigDecimal(100)).setScale(3,BigDecimal.ROUND_HALF_UP));
}
}


Loading…
Cancel
Save