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

[合同][修改][开发结算单]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
239a89b5e3
4 измененных файлов: 16 добавлений и 3 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumBillType.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  3. +11
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java
  4. +0
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 2
- 1
mallinkService/src/main/java/com/iformall/enums/EnumBillType.java Просмотреть файл

@@ -14,7 +14,8 @@ public enum EnumBillType {
POWER(5, "电费"),
ROUTINE(6, "其他"),
AIR_CONDITIONING(7, "空调费"),
OTHER_DEPOSIT(8, "其他押金")
OTHER_DEPOSIT(8, "其他押金"),
SETTLE(10, "结算单")
;

public static EnumBillType getEnum(Integer code) {


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

@@ -174,7 +174,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {
wxBillAll.setBillTypeValue(EnumBillTypeParam.ROUTINE.getCode());
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.AIR_CONDITIONING.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.AIR_CONDITIONING.getCode());
} else {
}else if (wxBillAll.getBillTypeValue().equals(EnumBillType.SETTLE.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.SETTLE.getCode());
} else {
logger.info("账单不存在");
return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND);
}


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

@@ -13,6 +13,7 @@ import com.iformall.exception.MallinkException;
import com.iformall.mapper.*;
import com.iformall.pay.*;
import com.iformall.service.WxBillAllService;
import com.iformall.service.WxBillSettleService;
import com.iformall.service.WxPayBillService;
import com.iformall.utils.*;
import org.apache.commons.lang3.StringUtils;
@@ -51,6 +52,9 @@ public class WxPayBillServiceImpl implements WxPayBillService {
@Autowired
WxMerchantBUserMapper wxMerchantBUserMapper;

@Autowired
private WxBillSettleService wxBillSettleService;

JSONObject errorMap = JSON.parseObject("{" +
"\"NOAUTH\":{\"detail\":\"商户无此接口权限\",\"reason\":\"商户未开通此接口权限\",\"resolution\":\"请商户前往申请此接口权限\"}," +
"\"NOTENOUGH\":{\"detail\":\"余额不足\",\"reason\":\"用户帐号余额不足\",\"resolution\":\"用户帐号余额不足,请用户充值或更换支付卡后再支付\"}," +
@@ -98,6 +102,13 @@ public class WxPayBillServiceImpl implements WxPayBillService {
//获取账单数据
Map<String, Object> bill = bills.get(0);
Long owe = (Long) bill.get("owe");
Integer billTypeValue = (Integer) bill.get("billTypeValue");

if(EnumBillType.SETTLE.getCode().equals(billTypeValue)){
WxBillSettle wxBillSettle = wxBillSettleService.getById(record.getBillId());
owe = wxBillSettle.getBalance();
logger.info("wxBillSettle.balance:{}",owe);
}
if (owe.longValue() <= 0) {
logger.info("账单欠缴为0");
return new ResultData(ErrorCode.BILL_OWE_ZERO);


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

@@ -375,7 +375,6 @@
left join wx_pay_bill pb on bill.id=pb.bill_id
where 1=1


<if test=" null != id ">
and bill.id=#{id}
</if>


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