优化支付时间为空问题

service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java

@@ -11,7 +11,9 @@ import com.java110.core.context.PageData;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
+import com.java110.dto.parking.ParkingAreaDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.intf.community.IParkingAreaV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerCarOpenUserV1InnerServiceSMO;
 import com.java110.po.ownerCarOpenUser.OwnerCarOpenUserPo;
 import com.java110.utils.cache.CommonCache;
@@ -58,6 +60,9 @@ public class ToPayTempCarFeeSMOImpl extends AppAbstractComponentSMO implements I
         return super.businessProcess(pd);
     }
 
+    @Autowired
+    private IParkingAreaV1InnerServiceSMO parkingAreaV1InnerServiceSMOImpl;
+
 
     @Override
     protected void validate(IPageData pd, JSONObject paramIn) {
@@ -76,6 +81,13 @@ public class ToPayTempCarFeeSMOImpl extends AppAbstractComponentSMO implements I
 
         ResponseEntity responseEntity = null;
 
+        //根据paId 查询communityId
+        ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+        parkingAreaDto.setPaId(paramIn.getString("paId"));
+        List<ParkingAreaDto> parkingAreaDtos = parkingAreaV1InnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+
+        Assert.listOnlyOne(parkingAreaDtos,"停车场不存在");
+        paramIn.put("communityId",parkingAreaDtos.get(0).getCommunityId());
         SmallWeChatDto smallWeChatDto = getSmallWechat(pd, paramIn);
 
         if (smallWeChatDto == null) { //从配置文件中获取 小程序配置信息

service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeePreTempCarInoutCmd.java

@@ -6,6 +6,7 @@ import com.java110.core.context.DataFlowContext;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.machine.CarInoutDto;
@@ -109,7 +110,7 @@ public class PayFeePreTempCarInoutCmd extends Cmd {
 
         JSONObject businessFeeDetail = new JSONObject();
         businessFeeDetail.putAll(paramInJson);
-        businessFeeDetail.put("detailId", "-1");
+        businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
         businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
         if (!businessFeeDetail.containsKey("state")) {
             businessFeeDetail.put("state", "1400");

service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/NotifyTempCarFeeOrderCmd.java

@@ -60,7 +60,7 @@ public class NotifyTempCarFeeOrderCmd extends Cmd {
         JSONObject paramObj = JSONObject.parseObject(paramIn);
         System.out.println("获取到内存中的数据了++++++++++++==》"+paramObj.toJSONString());
         modifyCouponUser(paramObj);
-        TempCarPayOrderDto tempCarPayOrderDto = BeanConvertUtil.covertBean(reqJson, TempCarPayOrderDto.class);
+        TempCarPayOrderDto tempCarPayOrderDto = BeanConvertUtil.covertBean(paramObj, TempCarPayOrderDto.class);
         ResponseEntity<String> responseEntity = getTempCarFeeRulesImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }

service-job/src/main/java/com/java110/job/adapt/hcIot/NotifyTempCarFeeOrderAdapt.java

@@ -73,7 +73,7 @@ public class NotifyTempCarFeeOrderAdapt extends DatabusAdaptImpl {
         postParameters.put("extPaId", tempCarPayOrderDto.getPaId());
         postParameters.put("orderId", tempCarPayOrderDto.getOrderId());
         postParameters.put("amount", tempCarPayOrderDto.getAmount());
-        postParameters.put("payTime", DateUtil.getFormatTimeString(tempCarPayOrderDto.getPayTime(), DateUtil.DATE_FORMATE_STRING_A));
+        postParameters.put("payTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         postParameters.put("payType", tempCarPayOrderDto.getPayType());
         HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders(outRestTemplate));
         ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.NOTIFY_TEMP_CAR_FEE_ORDER), HttpMethod.POST, httpEntity, String.class);