java110 3 anni fa
parent
commit
26df71eddf

+ 10 - 0
java110-bean/src/main/java/com/java110/dto/tempCarFeeConfig/TempCarPayOrderDto.java

@@ -26,6 +26,8 @@ public class TempCarPayOrderDto extends PageDto implements Serializable {
 
     private String machineId;
 
+    private String[] pccIds;
+
 
     public String getOrderId() {
         return orderId;
@@ -122,4 +124,12 @@ public class TempCarPayOrderDto extends PageDto implements Serializable {
     public void setMachineId(String machineId) {
         this.machineId = machineId;
     }
+
+    public String[] getPccIds() {
+        return pccIds;
+    }
+
+    public void setPccIds(String[] pccIds) {
+        this.pccIds = pccIds;
+    }
 }

+ 4 - 0
service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java

@@ -10,6 +10,7 @@ import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules;
 import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 
@@ -43,6 +44,9 @@ public class GetTempCarFeeOrderCmd extends Cmd {
         TempCarPayOrderDto tempCarPayOrderDto = new TempCarPayOrderDto();
         tempCarPayOrderDto.setPaId(reqJson.getString("paId"));
         tempCarPayOrderDto.setCarNum(reqJson.getString("carNum"));
+        if(reqJson.containsKey("pccIds") && !StringUtil.isEmpty(reqJson.getString("pccIds"))){
+            tempCarPayOrderDto.setPccIds(reqJson.getString("pccIds").split(","));
+        }
         ResponseEntity<String> responseEntity = getTempCarFeeRulesImpl.getTempCarFeeOrder(tempCarPayOrderDto);
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }

+ 1 - 0
service-job/src/main/java/com/java110/job/adapt/hcIot/GetTempCarFeeOrderAdapt.java

@@ -71,6 +71,7 @@ public class GetTempCarFeeOrderAdapt extends DatabusAdaptImpl {
         postParameters.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
         postParameters.put("carNum", tempCarPayOrderDto.getCarNum());
         postParameters.put("extPaId", tempCarPayOrderDto.getPaId());
+        postParameters.put("extPccIds",tempCarPayOrderDto.getPccIds());
         HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders(outRestTemplate));
         ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.GET_TEMP_CAR_FEE_ORDER), HttpMethod.POST, httpEntity, String.class);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {