Merge branch 'hotfix/20200115_商品校验接口失败移除购物车' into qa

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.1.3.RELEASE</version>
+    <version>1.1.5.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.1.RELEASE</version>
+            <version>1.1.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -6,4 +6,6 @@
 | 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
 | 1.1.1.RELEASE| 1.9.9sessionKey  | 胡超 | 20200108  |
 | 1.1.2.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 20200108  |
-| 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId）  | 胡超 | 20200113  |
\ No newline at end of file
+| 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId）  | 胡超 | 20200113  |
+| 1.1.4.RELEASE| 农工商submit接口  | 侯书虎 | 2020-01-13 |
+| 1.1.5.RELEASE| 农工商submit接口(del thirdCateId)  | 胡超 | 2020-01-13 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -72,6 +72,7 @@ public class OrderSdkAdapter {
         request.setStoreName(requestVO.getShopName());
         request.setPayTime(requestVO.getPayTime());
         request.setThirdStoreId(requestVO.getThirdShopId());
+        request.setThirdOrderCode(requestVO.getThirdOrderCode());
         if (requestVO.getOrderStatus() != null) {
             request.setOrderState(getNewOrderStatus(requestVO.getOrderStatus().getCode()));
         }
@@ -93,7 +94,7 @@ public class OrderSdkAdapter {
         request.setSettlementAmount(requestVO.getAmount());
         //实际支付现金金额，扣除支付自生优惠，单位分
         request.setActualPayAmount(requestVO.getAmount());
-        request.setOrderClient(OrderClientType.SAAS.getIndex());
+        request.setOrderClient(StringUtils.isEmpty(requestVO.getSource())? OrderClientType.SAAS.getIndex():getNewOrderClient(requestVO.getSource()));
         //订单业务类型 1:普通订单 2:虚拟订单
         request.setBizType(1);
         request.setNote(requestVO.getRemark());
@@ -285,6 +286,7 @@ public class OrderSdkAdapter {
                     orderSettlementCreateReq.setSettlementAmount(accountRequest.getPrice());
                     //是否线上 false:不是 true:是
                     orderSettlementCreateReq.setIsOnline(true);
+                    orderSettlementCreateReq.setExtInfo(accountRequest.getAddInfo());
 
                     orderSettlementCreateReqList.add(orderSettlementCreateReq);
                 }
@@ -1009,6 +1011,15 @@ public class OrderSdkAdapter {
             case "XY_DISCOUNT":
                 type = 104;
                 break;
+            case "TOTAL_DISCOUNT":
+                type=205;
+                break;
+            case "ONLINE_PAY":
+                type=218;
+                break;
+            case "OFFLINE_PAY":
+                type=219;
+                break;
             default:
                 break;
         }
@@ -1673,6 +1684,8 @@ public class OrderSdkAdapter {
             case 104:
                 newOrderAccountType = OldOrderAccountType.XY_DISCOUNT.getCode();
                 break;
+            case 205:
+                newOrderAccountType=OldOrderAccountType.TOTAL_DISCOUNT.getCode();
             default:
                 break;
         }
@@ -2382,6 +2395,9 @@ public class OrderSdkAdapter {
         if (StringUtils.isNotBlank(product.getThirdProductPropertyId())) {
             extInfo.setThirdProductPropertyId(product.getThirdProductPropertyId());
         }
+        if (StringUtils.isNotBlank(product.getThirdCategoryId())){
+            extInfo.setThirdCategoryId(product.getThirdCategoryId());
+        }
         orderItemCreateReq.setExtInfo(JSONObject.toJSONString(extInfo));
         orderItemList.add(orderItemCreateReq);
         if (product.getTotalDiscountAmount() != null && product.getTotalDiscountAmount() > 0L) {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/OrderExtInfoDTO.java

@@ -75,7 +75,7 @@ public class OrderExtInfoDTO {
     private boolean paidMember;
 
     /**
-     * 异常补退使用
+     * 微信上报异常补推使用
      */
     private String sessionKey;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -33,7 +33,8 @@ public enum OldOrderAccountType {
     CARD_ORIGINAL_AMOUNT(25, "会员卡原价", "CARD_ORIGINAL_AMOUNT"),
     SET_MEAL(211, "套餐商品优惠", "SET_MEAL"),
     CARD_DISCOUNT_AMOUNT(26, "会员卡优惠金额", "CARD_DISCOUNT_AMOUNT"),
-    XY_DISCOUNT(104, "x件y折", "XY_DISCOUNT");
+    XY_DISCOUNT(104, "x件y折", "XY_DISCOUNT"),
+    TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT");
     private Integer code;
 
     private String desc;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java

@@ -30,7 +30,7 @@ public enum OrderSourceType {
 
     SAAS("saas", "saas 点餐"),
 
-    POS("pos_order", "线下 POS"),
+    POS("pos", "线下 POS"),
 
     MEAL("meal", "i围餐");
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java

@@ -32,7 +32,10 @@ public enum QueryOrderAccountType {
     CARD_ORIGINAL_AMOUNT("CARD_ORIGINAL_AMOUNT", "会员卡原价"),
     SET_MEAL("SET_MEAL", "套餐商品优惠"),
     CARD_DISCOUNT_AMOUNT("CARD_DISCOUNT_AMOUNT", "会员卡优惠金额"),
-    XY_DISCOUNT("XY_DISCOUNT", "x件y折");
+    XY_DISCOUNT("XY_DISCOUNT", "x件y折"),
+    TOTAL_DISCOUNT("TOTAL_DISCOUNT", "优惠总金额"),
+    ONLINE_PAY("ONLINE_PAY", "线上支付"),
+    OFFLINE_PAY("OFFLINE_PAY", "线下支付");
     private String code;
 
     private String desc;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -38,6 +38,10 @@ public class BaseCreateOrderRequest extends BaseConfig {
      */
     private String userName;
     /**
+     * 三方单号
+     */
+    private String thirdOrderCode;
+    /**
      * 用户电话
      */
     private String phone;
@@ -170,9 +174,6 @@ public class BaseCreateOrderRequest extends BaseConfig {
          * 会员规则ID
          */
         private String ruleId;
-
-        /** 第三方商品分类编号，不必传 */
-        private String thirdCateId;
     }
 
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -80,6 +80,10 @@ public class CreateOrderProductRequest extends BaseConfig {
      */
     private String extras;
     /**
+     * 第三方菜品分类Id
+     */
+    private String thirdCategoryId;
+    /**
      * 商品所属菜单分类id
      */
     private String categoryId;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java

@@ -38,4 +38,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
      */
     private String thirdProductPropertyId;
 
+    /**
+     * 第三方品类id
+     */
+    private String thirdCategoryId;
+
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -264,7 +264,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
 
         }
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> response = orderSdkService.paySuccess(request, confirmOrderRequest.getTrackingNo());
-
+        //获取会员信息直接返回，非空判断
+        if(extendInfo.getData() == null){
+            return orderSdkAdapter.convent2PayAccessResponse(response);
+        }
         CalculationDiscountRequest discountRequest=activitySdkAdapter.convert2CalculationDiscountRequestDto(orderByIdResponse.getData(),extendInfo.getData());
         BaseResponse<CalculationDiscountResponseDTO> baseResponse=promotionSdkService.calculationDiscount(discountRequest,confirmOrderRequest.getTrackingNo());
         List<Integer> activityTypes=baseResponse.getData().getDiscounts().stream().map(DiscountDTO::getType).collect(Collectors.toList());

assortment-shoppingcart-sdk/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.4-SNAPSHOT</version>
+            <version>2.7.4.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -180,6 +180,7 @@ public interface ShoppingCartBaseService {
             ValidateShopProductRequest validateShopProductRequest = shoppingCartAdapter.getValidateShopProductRequest(checkCartRequest);
             com.freemud.application.sdk.api.base.BaseResponse<ValiadShopProductResponse> valiadResponse = productService.validateShopProduct(validateShopProductRequest);
             if (valiadResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(valiadResponse.getCode()) || valiadResponse.getData()==null) {
+                checkCartRequest.getCartGoodsList().forEach(cartGoods -> cartGoods.setCartGoodsUid(null));
                 checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                 checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
                 return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);

order-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.1.2.RELEASE</version>
+            <version>1.1.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/src/main/java/cn/freemud/entities/dto/OrderExtInfoDto.java

@@ -102,4 +102,9 @@ public class OrderExtInfoDto {
      * 扫呗商户号 新支付服务做中转使用
      */
     private String terminalId;
+
+    /**
+     * 微信上报使用的异常补退使用
+     */
+    private String sessionKey;
 }

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.1.RELEASE</version>
+    <version>1.1.2.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -4,4 +4,5 @@
 | ------------ | ---------------- | ------ | ---------- |
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
 | 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
-| 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
\ No newline at end of file
+| 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
+| 1.1.2.RELEASE| 农工商订单submit  | 侯书虎 | 2020-01-13  |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java

@@ -57,4 +57,13 @@ public enum OrderClientType {
         this.name = name;
     }
 
+    public static OrderClientType getOrderClientType(Integer index){
+        for (OrderClientType orderType : values()){
+            if (index.equals(orderType.getIndex())){
+                return orderType;
+            }
+        }
+        return null;
+    }
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderItemCreateReq.java

@@ -98,6 +98,11 @@ public class OrderItemCreateReq {
 
     //备注
     private String note;
+
+    /**
+     * 第三方商品分类
+     */
+    private String thirdCategoryId;
     //商品分类ID
     private String categoryId;
 
@@ -112,5 +117,10 @@ public class OrderItemCreateReq {
 
     // 是否删除
     private Boolean isDeleted;
+    /**
+     * 是否算积分
+     * 线下订单上传专用
+     */
+    private Boolean needBonus;
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderSettlementCreateReq.java

@@ -34,6 +34,10 @@ public class OrderSettlementCreateReq {
 
     //备注
     private String note;
+    /**
+     * 拓展字段
+     */
+    private String extInfo;
 
     //优惠覆盖数量
     private Integer number;

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.4-SNAPSHOT</version>
+            <version>2.7.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>