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

Merge tag 'refs/tags/jenkins-back-end-2685' into release

develop
release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
36c27ce814
3 измененных файлов: 15 добавлений и 12 удалений
  1. +7
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
  2. +7
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

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

@@ -126,13 +126,16 @@ public class WxBusinessServiceImpl implements WxBusinessService {
List<WxBillProperty> billRentList = wxPropertyContractService.buildProperty(new WxMerchant(),userid,dbRent, EnumIsPreview.YES.getCode(), false);
businessSumMoney = businessSumMoney.add(new BigDecimal(billRentList.get(0).getReceivePay()));
}

if(e.get("area") == null || "0".equals(e.get("area").toString())){
logger.info("业态分析>>>>>>>>>>>>>>>>>>商铺面积:" + e.get("area").toString());
if (e.get("area") == null || "0".equals(e.get("area").toString()) ||
"0.0".equals(e.get("area").toString())) {
e.put("rent",0);
}else {
BigDecimal area = new BigDecimal(e.get("area").toString());
BigDecimal areaRatio = businessSumMoney.divide(area, 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
e.put("rent", areaRatio.toBigInteger());
if (area.longValue() > 0) {
BigDecimal areaRatio = businessSumMoney.divide(area, 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
e.put("rent", areaRatio.toBigInteger());
}
}
});
return resultList;


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

@@ -318,15 +318,15 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv
logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage());
return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), "verifyNotifyHMAC");
}
}

receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode());
receiver.setUpdateTime(new Date());
wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver);
receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode());
receiver.setUpdateTime(new Date());
wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver);

//发送短信
if (send.equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) {
sendMsgByType(EnumMsgModel.DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), receiver.getMerchantId(), receiver.getReceiverAccount(), receiver.getTenantId());
}
//发送短信
if (send.equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) {
sendMsgByType(EnumMsgModel.DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), receiver.getMerchantId(), receiver.getReceiverAccount(), receiver.getTenantId());
}
return new ResultData();
}


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

@@ -814,7 +814,7 @@

<if test=" null != tenantId"> and tt.tenant_id = #{tenantId} </if>
<if test=" null != merchantId"> and tt.id = #{merchantId} </if>
<if test=" null != merchantName"> and tt.name like concat('%', #{merchantName},'%') </if>
<if test=" null != merchantName and ''!=merchantName">and tt.name like concat('%', #{merchantName},'%')</if>
<if test=" null != rentShopType"> and tt.rent_shop_type = #{rentShopType} </if>

<if test=" null != sortColumns"> order by ${sortColumns} </if>


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