优化代码

java110-bean/src/main/java/com/java110/dto/ownerCarOpenUser/OwnerCarOpenUserDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.ownerCarOpenUser;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,12 +15,15 @@ import java.util.Date;
  **/
 public class OwnerCarOpenUserDto extends PageDto implements Serializable {
 
+    public static final String OPEN_TYPE_WECHAT = "WECHAT";
+    public static final String OPEN_TYPE_ALIPAY = "ALI";
+
     private String openId;
-private String nickname;
-private String headimgurl;
-private String carNum;
-private String openUserId;
-private String openType;
+    private String nickname;
+    private String headimgurl;
+    private String carNum;
+    private String openUserId;
+    private String openType;
 
 
     private Date createTime;
@@ -30,37 +34,48 @@ private String openType;
     public String getOpenId() {
         return openId;
     }
-public void setOpenId(String openId) {
+
+    public void setOpenId(String openId) {
         this.openId = openId;
     }
-public String getNickname() {
+
+    public String getNickname() {
         return nickname;
     }
-public void setNickname(String nickname) {
+
+    public void setNickname(String nickname) {
         this.nickname = nickname;
     }
-public String getHeadimgurl() {
+
+    public String getHeadimgurl() {
         return headimgurl;
     }
-public void setHeadimgurl(String headimgurl) {
+
+    public void setHeadimgurl(String headimgurl) {
         this.headimgurl = headimgurl;
     }
-public String getCarNum() {
+
+    public String getCarNum() {
         return carNum;
     }
-public void setCarNum(String carNum) {
+
+    public void setCarNum(String carNum) {
         this.carNum = carNum;
     }
-public String getOpenUserId() {
+
+    public String getOpenUserId() {
         return openUserId;
     }
-public void setOpenUserId(String openUserId) {
+
+    public void setOpenUserId(String openUserId) {
         this.openUserId = openUserId;
     }
-public String getOpenType() {
+
+    public String getOpenType() {
         return openType;
     }
-public void setOpenType(String openType) {
+
+    public void setOpenType(String openType) {
         this.openType = openType;
     }
 

service-api/src/main/java/com/java110/api/smo/login/impl/OwnerAppLoginSMOImpl.java

@@ -10,8 +10,10 @@ import com.java110.core.context.PageData;
 import com.java110.core.factory.AuthenticationFactory;
 import com.java110.core.factory.WechatFactory;
 import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IOwnerCarOpenUserV1InnerServiceSMO;
 import com.java110.utils.cache.CommonCache;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ResponseConstant;
@@ -62,6 +64,9 @@ public class OwnerAppLoginSMOImpl extends DefaultAbstractComponentSMO implements
     @Autowired
     private WechatAuthProperties wechatAuthProperties;
 
+    @Autowired
+    private IOwnerCarOpenUserV1InnerServiceSMO ownerCarOpenUserV1InnerServiceSMOImpl;
+
     @Override
     public ResponseEntity<String> doLogin(IPageData pd) throws SMOException {
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
@@ -480,6 +485,15 @@ public class OwnerAppLoginSMOImpl extends DefaultAbstractComponentSMO implements
         String openId = paramObj.getString("openid");
         redirectUrl = redirectUrl + "&openId=" + openId;
 
+        //查询是否有车牌号
+        OwnerCarOpenUserDto ownerCarOpenUserDto = new OwnerCarOpenUserDto();
+        ownerCarOpenUserDto.setOpenId(openId);
+        List<OwnerCarOpenUserDto> ownerCarOpenUserDtos = ownerCarOpenUserV1InnerServiceSMOImpl.queryOwnerCarOpenUsers(ownerCarOpenUserDto);
+        if (ownerCarOpenUserDtos != null && ownerCarOpenUserDtos.size() > 0) {
+            redirectUrl += ("&carNum=" + ownerCarOpenUserDtos.get(0).getCarNum());
+        }
+
+
         //redirectUrl = redirectUrl + (redirectUrl.indexOf("?") > 0 ? "&key=" + tmpUserDto.getKey() : "?key=" + tmpUserDto.getKey());
         return ResultVo.redirectPage(redirectUrl);
     }

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

@@ -9,10 +9,11 @@ import com.java110.api.smo.payment.adapt.IPayAdapt;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.app.AppDto;
 import com.java110.dto.fee.FeeDto;
-import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.intf.user.IOwnerCarOpenUserV1InnerServiceSMO;
+import com.java110.po.ownerCarOpenUser.OwnerCarOpenUserPo;
 import com.java110.utils.cache.CommonCache;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.WechatConstant;
@@ -30,8 +31,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.Map;
 
 @Service("toPayTempCarFeeSMOImpl")
@@ -49,6 +48,9 @@ public class ToPayTempCarFeeSMOImpl extends AppAbstractComponentSMO implements I
     @Autowired
     private WechatAuthProperties wechatAuthProperties;
 
+    @Autowired
+    private IOwnerCarOpenUserV1InnerServiceSMO ownerCarOpenUserV1InnerServiceSMOImpl;
+
     @Override
     public ResponseEntity<String> toPay(IPageData pd) {
         return super.businessProcess(pd);
@@ -117,6 +119,16 @@ public class ToPayTempCarFeeSMOImpl extends AppAbstractComponentSMO implements I
         saveFees.put("payTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         saveFees.put("payType", "2");
         CommonCache.setValue(FeeDto.REDIS_PAY_TEMP_CAR_FEE + orderId, saveFees.toJSONString(), CommonCache.PAY_DEFAULT_EXPIRE_TIME);
+
+        //记录openId 和车辆关系 以免每次 输入 车牌号麻烦
+        OwnerCarOpenUserPo ownerCarOpenUserPo = new OwnerCarOpenUserPo();
+        ownerCarOpenUserPo.setCarNum(paramIn.getString("carNum"));
+        ownerCarOpenUserPo.setNickname("未获取");
+        ownerCarOpenUserPo.setHeadimgurl("为获取");
+        ownerCarOpenUserPo.setOpenId(openId);
+        ownerCarOpenUserPo.setOpenType(OwnerCarOpenUserDto.OPEN_TYPE_WECHAT);
+        ownerCarOpenUserPo.setOpenUserId(GenerateCodeFactory.getGeneratorId("10"));
+        ownerCarOpenUserV1InnerServiceSMOImpl.saveOwnerCarOpenUser(ownerCarOpenUserPo);
         return responseEntity;
     }