Ver código fonte

优化临时费用创建bug

wuxw 2 anos atrás
pai
commit
42a6b67c2e

+ 2 - 1
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImpl.java

@@ -11,6 +11,7 @@ import com.java110.intf.report.IGeneratorOweFeeInnerServiceSMO;
 import com.java110.po.payFee.PayFeeDetailMonthPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -176,7 +177,7 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
             feeDto.setFeeId(feeId);
             List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
 
-           if(tmpFeeDtos == null || tmpFeeDtos.size() < 1){
+           if(ListUtil.isNull(tmpFeeDtos)){
                continue;
            }
             generatorOweFeeInnerServiceSMOImpl.computeOweFee(tmpFeeDtos.get(0));

+ 3 - 1
service-job/src/main/java/com/java110/job/adapt/fee/RoomCreatePayFeeAdapt.java

@@ -211,13 +211,15 @@ public class RoomCreatePayFeeAdapt extends DatabusAdaptImpl {
         businessUnit.put("state", "2008001");
         businessUnit.put("batchId", paramInJson.getString("batchId"));
         businessUnit.put("userId", paramInJson.getString("userId"));
-        businessUnit.put("feeId", businessUnit.getString("feeId"));
         if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDto.getFeeFlag())
                 && !StringUtil.isEmpty(paramInJson.getString("endTime"))) {
             businessUnit.put("maxTime", paramInJson.getString("endTime"));
         } else {
             businessUnit.put("maxTime", feeConfigDto.getEndTime());
         }
+
+        paramInJson.put("feeId", businessUnit.getString("feeId"));
+
         return BeanConvertUtil.covertBean(businessUnit, PayFeePo.class);
     }