| @@ -8,6 +8,7 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.vo.WxCouponOrderCarCVo; | import com.iformall.domain.vo.WxCouponOrderCarCVo; | ||||
| import com.iformall.domain.vo.WxMerchantVo; | |||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import com.iformall.utils.ETCPUtil; | import com.iformall.utils.ETCPUtil; | ||||
| @@ -600,14 +601,8 @@ public class WxCarController extends BaseController { | |||||
| return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "停车费抵扣失败"); | return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "停车费抵扣失败"); | ||||
| } | } | ||||
| private String getETCPBusinessID(String merchantIdStr) { | |||||
| private String getETCPBusinessID(Long merchantId) { | |||||
| String businessId; | String businessId; | ||||
| Long merchantId = 0L; | |||||
| try { | |||||
| merchantId = Long.valueOf(merchantIdStr); | |||||
| } catch (NumberFormatException e) { | |||||
| logger.error(e.getMessage()); | |||||
| } | |||||
| WxMerchant wxMerchant = wxMerchantService.getById(merchantId); | WxMerchant wxMerchant = wxMerchantService.getById(merchantId); | ||||
| String carParams = wxMerchant.getCarParams(); | String carParams = wxMerchant.getCarParams(); | ||||
| JSONObject objParams1 = JSON.parseObject(carParams); | JSONObject objParams1 = JSON.parseObject(carParams); | ||||
| @@ -665,8 +660,14 @@ public class WxCarController extends BaseController { | |||||
| String merchantKey = objParams.getString("merchantKey"); | String merchantKey = objParams.getString("merchantKey"); | ||||
| String version = objParams.getString("version"); | String version = objParams.getString("version"); | ||||
| String businessId = ""; | String businessId = ""; | ||||
| // 获取merchantId | |||||
| WxMerchantVo merchantVo = null; | |||||
| if(userCar.getMerchantVoList().size() > 0) { | |||||
| merchantVo = userCar.getMerchantVoList().get(0); | |||||
| } | |||||
| // 优先从从商户表里取 | // 优先从从商户表里取 | ||||
| businessId = getETCPBusinessID(String.valueOf(userCar.getMerchantId())); | |||||
| businessId = getETCPBusinessID(merchantVo.getId()); | |||||
| if (StringUtils.isBlank(businessId)) { | if (StringUtils.isBlank(businessId)) { | ||||
| // 1期只有一个虚拟商户,可以写在商场配置里 | // 1期只有一个虚拟商户,可以写在商场配置里 | ||||
| businessId = objParams.getString("businessId"); | businessId = objParams.getString("businessId"); | ||||
| @@ -79,9 +79,6 @@ public class WxCouponOrderCVo extends WxCouponOrder { | |||||
| private Integer couponPrice; | private Integer couponPrice; | ||||
| /* 券类型信息 */ | /* 券类型信息 */ | ||||
| /*商户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") | |||||
| private Long merchantId; | |||||
| /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ | /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") | @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| @@ -196,13 +193,6 @@ public class WxCouponOrderCVo extends WxCouponOrder { | |||||
| couponPrice = _couponPrice; | couponPrice = _couponPrice; | ||||
| } | } | ||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Integer getType() { | public Integer getType() { | ||||
| return type; | return type; | ||||
| } | } | ||||
| @@ -100,8 +100,10 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxPropertyContract.setApplyStatus(applyStatus); | wxPropertyContract.setApplyStatus(applyStatus); | ||||
| wxPropertyContractMapper.updateApplyStatus(wxPropertyContract); | wxPropertyContractMapper.updateApplyStatus(wxPropertyContract); | ||||
| // 物业合同的合同状态需要和租赁合同同步(一致) | |||||
| wxPropertyContractService.updatePropertyContractStatus(businessId); | |||||
| // 审批完成,物业合同的合同状态需要和租赁合同同步(一致) | |||||
| if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { | |||||
| wxPropertyContractService.updatePropertyContractStatus(businessId); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -385,7 +387,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxMsgValidationcode.setPhone(starter.getPhone()); | wxMsgValidationcode.setPhone(starter.getPhone()); | ||||
| wxMsgValidationcodeService.sendWorkFlowNodify(wxMsgValidationcode,msgReplaceMap); | wxMsgValidationcodeService.sendWorkFlowNodify(wxMsgValidationcode,msgReplaceMap); | ||||
| }else{ | }else{ | ||||
| //todo 需要测下三节点 | |||||
| //需要测下三节点 | |||||
| //继续递归判断 | //继续递归判断 | ||||
| isEndAndSendMsg(mapInfo,taskKey,processInstanceId,tenantId,userName); | isEndAndSendMsg(mapInfo,taskKey,processInstanceId,tenantId,userName); | ||||
| } | } | ||||
| @@ -575,6 +575,12 @@ | |||||
| <result column="coupon_free_id" jdbcType="INTEGER" property="couponFreeId"/> | <result column="coupon_free_id" jdbcType="INTEGER" property="couponFreeId"/> | ||||
| <collection column="{productId=coupon_id}" property="merchantVoList" | |||||
| ofType="com.iformall.domain.vo.WxMerchantVo" | |||||
| javaType="java.util.List" | |||||
| select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" > | |||||
| </collection> | |||||
| </resultMap> | </resultMap> | ||||