optimize code

java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -338,6 +338,8 @@
         from owner_car t
         left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id =
         t.community_id
+        left join parking_space ps on t.ps_id = ps.ps_id and ps.status_cd = '0'
+        left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
         <if test="memberCarNumLike !=null and memberCarNumLike != ''">
             left join owner_car moc on t.car_id = moc.car_id and moc.car_type_cd != t.car_type_cd and moc.car_type_cd = '1002'
         </if>
@@ -423,6 +425,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="paIds !=null">
+            and pa.pa_id in
+            <foreach collection="paIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>

service-acct/src/main/java/com/java110/acct/payment/business/goods/BuyGoodsBusiness.java

@@ -1,40 +0,0 @@
-package com.java110.acct.payment.business.goods;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.acct.payment.IPaymentBusiness;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.factory.CallApiServiceFactory;
-import com.java110.dto.payment.PaymentOrderDto;
-import org.springframework.stereotype.Service;
-
-@Service("buyGoods")
-public class BuyGoodsBusiness implements IPaymentBusiness {
-    @Override
-    public PaymentOrderDto unified(ICmdDataFlowContext context, JSONObject reqJson) {
-
-        String appId = context.getReqHeaders().get("app-id");
-        String userId = context.getReqHeaders().get("user-id");
-
-        ///api/cart/unifiedOrder
-        JSONObject orderInfo = CallApiServiceFactory.postForApi(appId, reqJson, "/cart/unifiedOrder", JSONObject.class, userId);
-        String orderId = orderInfo.getString("orderId");
-        String feeName = "购买商品";
-        double money = Double.parseDouble(orderInfo.getString("payPrice"));
-
-        PaymentOrderDto paymentOrderDto = new PaymentOrderDto();
-        paymentOrderDto.setOrderId(orderId);
-        paymentOrderDto.setMoney(money);
-        paymentOrderDto.setName(feeName);
-        return paymentOrderDto;
-    }
-
-    @Override
-    public void notifyPayment(PaymentOrderDto paymentOrderDto, JSONObject reqJson) {
-
-        JSONObject paramIn = new JSONObject();
-        paramIn.put("orderId", paymentOrderDto.getOrderId());
-        paramIn.put("payOrderId",paymentOrderDto.getTransactionId());
-        JSONObject paramOut = CallApiServiceFactory.postForApi(paymentOrderDto.getAppId(), reqJson, "/cart/payNotifyOrder", JSONObject.class, paymentOrderDto.getUserId());
-
-    }
-}

service-acct/src/main/java/com/java110/acct/payment/business/goods/BuyGroupGoodsBusiness.java

@@ -1,54 +0,0 @@
-package com.java110.acct.payment.business.goods;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.acct.payment.IPaymentBusiness;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.factory.CallApiServiceFactory;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.payment.PaymentOrderDto;
-import org.springframework.stereotype.Service;
-
-@Service("buyGroupGoods")
-public class BuyGroupGoodsBusiness implements IPaymentBusiness {
-    @Override
-    public PaymentOrderDto unified(ICmdDataFlowContext context, JSONObject reqJson) {
-
-        String appId = context.getReqHeaders().get("app-id");
-        String userId = context.getReqHeaders().get("user-id");
-
-        /**
-         * ?page=1&row=1&shopId=502022081626050001&cartType=3306
-         * &productId=902022120101840004&valueId=912022120139430012&goodsNum=1&groupId=102022122018530001
-         */
-
-        JSONObject paramIn = new JSONObject();
-        paramIn.put("page",1);
-        paramIn.put("row",1);
-        paramIn.put("shopId",reqJson.getString("shopId"));
-        paramIn.put("cartType","3306");
-        paramIn.put("productId",reqJson.getString("productId"));
-        paramIn.put("valueId",reqJson.getString("valueId"));
-        paramIn.put("goodsNum",reqJson.getString("goodsNum"));
-        paramIn.put("groupId",reqJson.getString("groupId"));
-        JSONObject orderInfo = CallApiServiceFactory.getForApi(appId, null, "storeOrder.computeGroupProductPrice"+CallApiServiceFactory.mapToUrlParam(paramIn),
-                JSONObject.class);
-        String orderId = GenerateCodeFactory.getGeneratorId("11");
-        String feeName = "购买商品";
-        double money = Double.parseDouble(orderInfo.getString("payPrice"));
-
-        PaymentOrderDto paymentOrderDto = new PaymentOrderDto();
-        paymentOrderDto.setOrderId(orderId);
-        paymentOrderDto.setMoney(money);
-        paymentOrderDto.setName(feeName);
-        reqJson.put("payAmount",money+"");
-        return paymentOrderDto;
-    }
-
-    @Override
-    public void notifyPayment(PaymentOrderDto paymentOrderDto, JSONObject reqJson) {
-        reqJson.put("orderId", paymentOrderDto.getOrderId());
-        reqJson.put("payOrderId",paymentOrderDto.getTransactionId());
-        JSONObject paramOut = CallApiServiceFactory.postForApi(paymentOrderDto.getAppId(), reqJson, "cart.unifiedGroupProductOrder", JSONObject.class, paymentOrderDto.getUserId());
-
-    }
-}

service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java

@@ -80,6 +80,7 @@ public class SaveOwnerCarCmd extends Cmd {
         OwnerCarDto ownerCarDto = new OwnerCarDto();
         ownerCarDto.setCommunityId(reqJson.getString("communityId"));
         ownerCarDto.setCarNum(reqJson.getString("carNum"));
+        ownerCarDto.setPaIds(new String[]{parkingSpaceDtos.get(0).getPaId()});
         ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY, OwnerCarDto.CAR_TYPE_MEMBER}); // 临时车除外
         int count = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(ownerCarDto);
 

service-user/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java

@@ -128,10 +128,11 @@ public class UserInnerServiceSMOImpl implements IUserInnerServiceSMO {
             userDto.setUserAttrs(userAttrDtos);
             for (UserAttrDto userAttrDto : userAttrDtos) {
                 //openId 单独出来处理
-                if ("100201911001".equals(userAttrDto.getSpecCd())) {
+                if (UserAttrDto.SPEC_OPEN_ID.equals(userAttrDto.getSpecCd())) {
                     userDto.setOpenId(userAttrDto.getValue());
                 }
 
+                // 商城 openId
                 if (UserAttrDto.SPEC_MALL_OPEN_ID.equals(userAttrDto.getSpecCd())){
                     userDto.setMallOpenId(userAttrDto.getValue());
                 }