java110-bean/src/main/java/com/java110/dto/tempCarFeeConfig/TempCarPayOrderDto.java
@@ -24,6 +24,8 @@ private Date payTime; private String payType; private String machineId; public String getOrderId() { return orderId; @@ -112,4 +114,12 @@ public void setPayType(String payType) { this.payType = payType; } public String getMachineId() { return machineId; } public void setMachineId(String machineId) { this.machineId = machineId; } } service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
@@ -106,7 +106,10 @@ } //查询用户ID paramIn.put("userId", pd.getUserId()); String url = "tempCarFee.queryTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum")+"&couponIds="+StringUtils.join(couponIds,","); String url = "tempCarFee.queryTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum") + "&machineId=" + paramIn.getString("machineId") +"&couponIds="+StringUtils.join(couponIds,","); responseEntity = super.callCenterService(restTemplate, pd, "", url, HttpMethod.GET); if (responseEntity.getStatusCode() != HttpStatus.OK) { service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java
@@ -21,6 +21,7 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.log.LoggerFactory; import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto; import com.java110.dto.smallWeChat.SmallWeChatDto; import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO; @@ -31,7 +32,6 @@ import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.slf4j.Logger; import com.java110.core.log.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; @@ -60,6 +60,7 @@ private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl; @Autowired private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) { Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息"); @@ -75,11 +76,15 @@ smallWeChatDto.setWeChatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC); List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto); String ownerUrl = MappingCache.getValue("OWNER_WECHAT_URL"); ownerUrl += ("/#/pages/tempParkingFee/tempParkingFee?paId="+ getPaIds(reqJson)); if(smallWeChatDtos != null && smallWeChatDtos.size()> 0){ ownerUrl += ("&appId="+smallWeChatDtos.get(0).getAppId()); ownerUrl += ("/#/pages/tempParkingFee/tempParkingFee?paId=" + getPaIds(reqJson)); if (smallWeChatDtos != null && smallWeChatDtos.size() > 0) { ownerUrl += ("&appId=" + smallWeChatDtos.get(0).getAppId()); } reqJson.put("url",ownerUrl); if (reqJson.containsKey("machineId") && !"-1".equals(reqJson.getString("machineId"))) { ownerUrl += ("&machineId=" + reqJson.getString("machineId")); } reqJson.put("url", ownerUrl); cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(reqJson)); }
@@ -25,6 +25,7 @@ import com.java110.intf.user.IUserInnerServiceSMO; import com.java110.job.adapt.DatabusAdaptImpl; import com.java110.utils.util.DateUtil; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; @@ -75,6 +76,10 @@ postParameters.put("amount", tempCarPayOrderDto.getAmount()); postParameters.put("payTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A)); postParameters.put("payType", tempCarPayOrderDto.getPayType()); if(!StringUtil.isEmpty(tempCarPayOrderDto.getMachineId())) { postParameters.put("extMachineId", tempCarPayOrderDto.getMachineId()); } 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); if (responseEntity.getStatusCode() != HttpStatus.OK) { service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java
@@ -76,6 +76,7 @@ OwnerCarDto ownerCarDto = new OwnerCarDto(); ownerCarDto.setCommunityId(reqJson.getString("communityId")); ownerCarDto.setCarNum(reqJson.getString("carNum")); ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY,OwnerCarDto.CAR_TYPE_MEMBER}); // 临时车除外 int count = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(ownerCarDto); if (count > 0) { springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
@@ -107,7 +107,10 @@ } //查询用户ID paramIn.put("userId", pd.getUserId()); String url = "tempCarFee.queryTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum")+"&couponIds="+StringUtils.join(couponIds,","); String url = "tempCarFee.queryTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum") + "&machineId=" + paramIn.getString("machineId") +"&couponIds="+StringUtils.join(couponIds,","); responseEntity = super.callCenterService(restTemplate, pd, "", url, HttpMethod.GET); if (responseEntity.getStatusCode() != HttpStatus.OK) {
