merge

assortment-shoppingcart-sdk/pom.xml

@@ -55,7 +55,7 @@
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
             <version>1.5.2.RELEASE</version>
-            <version>1.4.4-SNAPSHOT</version>
+<!--            <version>1.4.4-SNAPSHOT</version>-->
             <scope>provided</scope>
         </dependency>
         <dependency>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -3208,4 +3208,135 @@ public class OrderAdapter {
         return StringUtils.isNotBlank(payChannel) && OrderAdapter.PAY_CODE_10102.equalsIgnoreCase(payChannel);
     }
 
+    /**
+     * 支付信息转换
+     */
+    public UnifiedOrderApplicationRequest convent2CombPayOrderRequest(List<OrderPayItemCreateReq> orderPayItemCreateReqList, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String partnerPayOvertime) {
+        UnifiedOrderApplicationRequest orderPayDto = new UnifiedOrderApplicationRequest();
+        orderPayDto.setEbCode(paymentRequest.getPayCode());
+        orderPayDto.setPartnerId(orderBean.getCompanyId());
+        orderPayDto.setBody(paymentRequest.getPrincipalName());
+        orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl());
+        orderPayDto.setStoreId(orderBean.getShopId());
+        orderPayDto.setOpenId(paymentRequest.getOpenId());
+        String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
+        orderPayDto.setBusinessDate(businessDate);
+        orderPayDto.setAmount(amount);
+        orderPayDto.setUndisAmount(1L);
+        orderPayDto.setVipAmount(Long.valueOf(cardAmount));
+        orderPayDto.setAppId(paymentRequest.getWxAppId());
+        orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
+        List<ProductVO> productVOS = new ArrayList<ProductVO>();
+        if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
+            orderBean.getProductList().forEach(orderProductBean -> {
+                ProductVO productBean = new ProductVO();
+                productBean.setId(orderProductBean.getProductId());
+                productBean.setQuantity(BigDecimal.valueOf(orderProductBean.getNumber()));
+                productBean.setSeq(orderProductBean.getSequence());
+                productBean.setSalesType("NORMAL");
+                productBean.setPrice(orderProductBean.getPrice());
+                productBean.setName(orderProductBean.getProductName());
+                productVOS.add(productBean);
+            });
+        }
+        orderPayDto.setProducts(productVOS);
+        orderPayDto.setPayCode(paymentRequest.getPayCode());
+        orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
+        List<PayPlatformVO> platforms = new ArrayList<>();
+        if (null != orderPayItemCreateReqList && orderPayItemCreateReqList.size() > 0) {
+            orderPayItemCreateReqList.forEach(OrderPayItem -> {
+                PayPlatformVO payPlatformVO = new PayPlatformVO();
+                payPlatformVO.setAmount(OrderPayItem.getPayAmount().longValue());
+                payPlatformVO.setEbcode(getEbCode4PayOrderCenter(OrderPayItem.getPayChannelType()));
+                platforms.add(payPlatformVO);
+            });
+        }
+        orderPayDto.setPlatforms(platforms);
+        orderPayDto.setOutOrderNo(orderBean.getOid());
+        return orderPayDto;
+    }
+
+    public OrderPayResponse convent2OrderCombPayResponse(UnifiedOrderApiResponse unifiedOrderResponse) {
+        OrderPayResponse responseDto = new OrderPayResponse();
+        responseDto.setFmId(unifiedOrderResponse.getFmTradeNo());
+        responseDto.setMsg(unifiedOrderResponse.getMessage());
+        responseDto.setPayEbcode(unifiedOrderResponse.getEbCode());
+        responseDto.setPayId(unifiedOrderResponse.getPrepayId());
+        OrderPayResponse.PayOrderBean payBean = new OrderPayResponse.PayOrderBean();
+        payBean.setAppid(unifiedOrderResponse.getAppId());
+        payBean.setNonceStr(unifiedOrderResponse.getNonceStr());
+        payBean.setPackageX(unifiedOrderResponse.get_package());
+        payBean.setSign(unifiedOrderResponse.getPaySign());
+        payBean.setSignType(unifiedOrderResponse.getPaySignType());
+        payBean.setTimestamp(unifiedOrderResponse.getTimestamp());
+        payBean.setAliPayOrder(unifiedOrderResponse.getPayAccount());
+        responseDto.setPayOrder(payBean);
+        responseDto.setStatusCode(unifiedOrderResponse.getCode());
+        return responseDto;
+    }
+
+    /**
+     * @param payChannelType
+     * @return
+     * @nots 基础服务映射, 存储数据库用 payChannel 映射 payChannelType java类
+     */
+    public String getPayChannel4SharedOrder(Integer payChannelType) {
+        String payChannel = "";
+        switch (payChannelType) {
+            case 1:
+                payChannel = "10211";
+                break;
+            case 2:
+                payChannel = "10102";
+                break;
+            case 3:
+                payChannel = "支付宝";
+                break;
+            case 4:
+                payChannel = "10212";
+                break;
+        }
+        return payChannel;
+    }
+
+    /**
+     * @param payChannelType
+     * @return
+     * @nots 基础支付
+     */
+    public String getEbCode4PayOrderCenter(String payChannelType) {
+        String ebCode = "";
+        switch (payChannelType) {
+            case "1":
+                ebCode = "10004";
+                break;
+            case "2":
+                ebCode = "10200";
+                break;
+            case "3":
+                ebCode = "10001";
+                break;
+            case "4":
+                ebCode = "";
+                break;
+        }
+        return ebCode;
+    }
+
+    public List<AssortmentOpenPlatformPartnerWxappConfig> cacheSelectDefaultPage(String wxAppId, String type) {
+        if (!StringUtils.isEmpty(wxAppId) && !StringUtils.isEmpty(type)) {
+            String hashKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_" + wxAppId;
+            Object value = redisCache.hashGet(hashKey, type);
+            JSONArray jsonArray = value != null ? JSONArray.parseArray(value.toString()) : new JSONArray();
+            if (null != jsonArray && jsonArray.size() > 0) {
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = (JSONObject) jsonArray.get(i);
+                    jsonObject.remove("@type");
+                }
+            }
+            return (value != null ? JSONObject.parseArray(jsonArray.toString(), AssortmentOpenPlatformPartnerWxappConfig.class) : new ArrayList());
+        } else {
+            return new ArrayList();
+        }
+    }
 }

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -84,6 +84,9 @@ public enum ResponseResult {
     SHOPPING_CART_SENDGOODS_NOT_EXIST("44011", "加价购商品不存在"),
     SHOPPING_CART_STOCK_NOT_HAVE("44012", "商品库存不足"),
     SHOPPING_CART_PRODUCT_NOT_EXIST("44013", "商品不存在"),
+    ORDER_TAKE_MEAL_TIME_ERROR("450062", "你的到店取餐时间异常，请重新选择！"),
+    ORDER_MEALTIME_MISSING("450063", "你的取餐方式或取餐时间异常，请重新选择!"),
+    ORDER_TAKE_OUT_TIME_ERROR("450062", "你的外卖送达时间异常，请重新选择！"),
 
     /**
      * 订单状态码

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -609,8 +609,8 @@ public class OrderServiceImpl implements Orderservice {
             }
         }
         //核销券
-        BaseResponse baseResponse = couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF);
-        return "核销券码返回结果" + baseResponse.getCode() + "," + baseResponse.getMessage();
+        return couponActivityService.verificationCoupon(orderBean, CouponReqType.WRITEOFF);
+        //return "核销券码返回结果" + baseResponse.getCode() + "," + baseResponse.getMessage();
     }
 
     @Override