sunyu::resolve conflicts::fix about merge branch conflicts

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.2.21-SNAPSHOT</version>
+    <version>2.2.24-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.7.5-SNAPSHOT</version>
+            <version>1.7.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -109,3 +109,5 @@
 | 2.2.18-SNAPSHOT|  抖音支付新增抖音单号和openId   | 张志恒 | 2020-12-4 |
 | 2.2.19-SNAPSHOT|  买一赠一寄件   | 刘鹏飞 | 2020-12-11 |
 | 2.2.20-SNAPSHOT|  抖音支付   | 张志恒 | 2020-12-11 |
+| 2.2.22-SNAPSHOT|  添加储值卡支付   | 梁崇福 | 2020-12-22 |
+| 2.2.24-SNAPSHOT|  抖音支付新增抖音单号和openId   | 张志恒 | 2020-12-22 |

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

@@ -624,6 +624,7 @@ public class OrderSdkAdapter {
                 orderClients.add(OrderClientType.APP.getIndex());
             }
         }
+        orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
         orderClients.add(OrderClientType.ALIPAY.getIndex());
         orderConditionsReq.setOrderClients(orderClients);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java

@@ -75,6 +75,14 @@ public class OrderPayResponse {
      * 抖音支付的orderToken 映射为我们thirdOrderToken
      */
     private String thirdOrderToken;
+    // 回调地址
+    private String payNotifyUrl;
+    //商户id
+    private String sellerId;
+    // 支付类型：机场支付=20099
+    private String ebCode;
+
+
 
     @NoArgsConstructor
     @Data

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.21-SNAPSHOT</version>
+            <version>2.2.22-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -2098,15 +2098,16 @@ public class OrderAdapter {
                 discountTotalAmount = discountTotalAmount + productDiscount.getDiscountAmount()*productDiscount.getDiscountQty();
                 if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
                     hasProductCoupon = true;
-                    Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
-                    if(null != extendType && (3 == extendType || 4 == extendType || 5 == extendType)) {
-                        productVo.setCouponName(productDiscount.getDiscountDesc());
-                    } else {
-                        productVo.setName(productDiscount.getDiscountDesc());
-                        productVo.setSpuName(productDiscount.getDiscountDesc());
-                        productVo.setExtras("");
-                        productVo.setSpecification("");
-                    }
+                    productVo.setCouponName(productDiscount.getDiscountDesc());
+//                    Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
+//                    if(null != extendType && (3 == extendType || 4 == extendType || 5 == extendType)) {
+//                        productVo.setCouponName(productDiscount.getDiscountDesc());
+//                    } else {
+//                        productVo.setName(productDiscount.getDiscountDesc());
+//                        productVo.setSpuName(productDiscount.getDiscountDesc());
+//                        productVo.setExtras("");
+//                        productVo.setSpecification("");
+//                    }
                 }
                 if (OrderAccountType.BUYM_SENDN.getCode().equals(productDiscount.getDiscountType())) {
                     activityType = ActivityTypeEnum.TYPE_61.getCode();
@@ -2136,6 +2137,9 @@ public class OrderAdapter {
         //套餐
         productVo.setParentProductId(productBean.getParentProductId());
         productVo.setProductType(productBean.getProductType());
+        if(ProductTypeEnum.TABLEWARE_PRODUCT.getCode().equals(productBean.getProductType())) {
+            productVo.setIsTableware(true);
+        }
         productVo.setUnit(productBean.getUnit());
         productVo.setWeight(productBean.getWeight() != null ? productBean.getWeight().doubleValue() : 0);
         return productVo;
@@ -2455,7 +2459,11 @@ public class OrderAdapter {
         createOrderProductDemoDto.setPicture(cartGoodsDetailDto.getPicture());
         createOrderProductDemoDto.setAddInfo(cartGoodsDetailDto.getAttributeNames());
         createOrderProductDemoDto.setDiscountId(cartGoodsDetailDto.getCouponCode());
-        createOrderProductDemoDto.setProductType(productType);
+        if(cartGoodsDetailDto.getIsTableware() == 0) {
+            createOrderProductDemoDto.setProductType(productType);
+        } else {
+            createOrderProductDemoDto.setProductType(ProductTypeEnum.TABLEWARE_PRODUCT.getCode());
+        }
         createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
         createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
         createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
@@ -2910,6 +2918,15 @@ public class OrderAdapter {
             payBean.setTimestamp(payOrderBean.getTimestamp());
             payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
             responseDto.setPayOrder(payBean);
+            // coco 机场支付
+            try {
+                JSONObject jsonObject = JSONObject.parseObject(payOrderBean.getAliPayOrder());
+                responseDto.setSellerId(jsonObject.getString("sellerId"));
+                responseDto.setPayNotifyUrl(jsonObject.getString("payNotifyUrl"));
+                responseDto.setEbCode(jsonObject.getString("ebCode"));
+            }catch (Exception e){
+
+            }
         }
         responseDto.setStatusCode(unifiedOrderResponse.getStatusCode());
         responseDto.setPayTransId(unifiedOrderResponse.getPayTransId());

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -395,4 +395,15 @@ public class OrderController {
         return orderservice.queryOrderRider(requestVo);
     }
 
+    /**
+     * 用户开放平台,订单支付完成回调
+     * @param requestVo
+     * @return
+     */
+    @ApiAnnotation(logMessage = "platform/paysuccess")
+    @PostMapping("/platform/paysuccess")
+    public BaseResponse platformPaysuccess(@Validated @LogParams @RequestBody PlatformPaySuccessRequest requestVo){
+        return orderservice.platformPaysuccess(requestVo);
+    }
+
 }

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

@@ -23,6 +23,11 @@ import java.util.List;
 @Data
 public class PayGiftCheckAndJoinResponseDto {
 
+    /**
+     * 活动号
+     */
+    private  String activityNo;
+
     private  String activityName;
     /**
      * 发送方式

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

@@ -26,4 +26,7 @@ public class PayGitCheckAndJoinRequestDto {
     private Integer orderWay;
 
     private List<String> skuIds;
+
+    // 版本号
+    private Integer ver;
 }

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

@@ -203,6 +203,10 @@ public class ShoppingCartGoodsDto {
          */
         private boolean isStockLimit;
         /**
+         * 是否餐具商品
+         */
+        private Integer isTableware = 0;
+        /**
          * 商品重量
          */
         private Double weight;

order-application-service/src/main/java/cn/freemud/entities/vo/PlatformPaySuccessRequest.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+@Data
+public class PlatformPaySuccessRequest {
+
+    @NotEmpty(message = "orderCode 不能为空")
+    private String orderCode;
+
+    @NotEmpty(message = "商户号 不能为空")
+    private String partnerId;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java

@@ -154,6 +154,11 @@ public class ProductVo {
     private Integer productType;
 
     /**
+     * 是否餐具商品
+     */
+    private Boolean isTableware = false;
+
+    /**
      * 商品单位
      */
     private String unit;

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -145,4 +145,8 @@ public interface Orderservice {
 
 
     BaseResponse queryOrderRider(OrderRiderRequestVo requestVo);
+
+    BaseResponse platformPaysuccess(PlatformPaySuccessRequest requestVo);
+
 }
+

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

@@ -708,6 +708,9 @@ public class CheckMCCafeOrder {
         //校验收货地址是否可配送
         String receiveId = createOrderVo.getReceiveId();
         String trackingNo = LogThreadLocal.getTrackingNo();
+        if(StringUtils.isBlank(receiveId)) {
+            throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_INVAILD, "收货地址不能为空");
+        }
         QueryReceiveAddressRequest request = new QueryReceiveAddressRequest(receiveId, storeDeliveryInfoDto.getPartnerId());
         BaseResponse<QueryReceiveAddressResponse> queryReceiveAddressResponse = memberCenterService.queryReceiveAddressById(request, trackingNo);
         if (!ResponseResult.SUCCESS.getCode().equals(queryReceiveAddressResponse.getCode()) || queryReceiveAddressResponse.getData() == null) {

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

@@ -1239,7 +1239,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     public String mcCafeRefundNotifyCallback(RefundNotifyCallbackRequestVo requestVo) {
         if (StringUtils.isEmpty(requestVo.getTransId())) {
             //订单号不能为空
-            return refundFaileMessage("transId is can not empty");
+            return refundFailedMessage("transId is can not empty");
         }
         //混合支付需要从缓存中获取订单号码，正常支付TransId = orderId
         String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(requestVo.getTransId()));
@@ -1247,19 +1247,18 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             requestVo.setTransId(orderId);
         }
         String trackingNo = LogTreadLocal.getTrackingNo();
-        Integer refundStatus = requestVo.getRefundStatus();
-        if (!Objects.equals(refundStatus, ResponseCodeConstant.RESPONSE_SUCCESS)) {
+        if (!Objects.equals(requestVo.getRefundStatus(), RefundStatus.COMPLETE_REFUND.getCode())) {
             //只有退款成功更新状态.其他情况不处理
-            return refundFaileMessage("pay refundStatus is not 100,refundStatus=" + refundStatus);
+            return refundFailedMessage("pay refundStatus is not 4,refundStatus=" + requestVo.getRefundStatus());
         }
         // 如果transId为空,返回失败
         if (StringUtils.isBlank(requestVo.getTransId())) {
-            return refundFaileMessage("transId is empty " + requestVo);
+            return refundFailedMessage("transId is empty " + requestVo);
         }
         //查询订单详情
         QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(requestVo.getTransId());
         if (queryOrderByIdResponseDto.getData() == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, queryOrderByIdResponseDto.getErrcode())) {
-            return refundFaileMessage("order query fail " + queryOrderByIdResponseDto);
+            return refundFailedMessage("order query fail " + queryOrderByIdResponseDto);
         }
 
         OrderBean orderBean = new OrderBean();
@@ -1293,7 +1292,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
         if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
             LogUtil.error("mcCafeRefundNotifyCallback", orderRefundRequest, baseOrderResponse);
-            return refundFaileMessage("create after sale order failed");
+            return refundFailedMessage("create after sale order failed");
         }
 
 
@@ -1367,7 +1366,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     /**
      * 退款中回调失败返回信息
      */
-    public String refundFaileMessage(String errorMes) {
+    public String refundFailedMessage(String errorMes) {
         Map<String, Object> map = Maps.newTreeMap();
         map.put("code", 500);
         map.put("message", "failed:" + errorMes);

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

@@ -1240,6 +1240,25 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(responseVo);
     }
 
+    @Override
+    public BaseResponse platformPaysuccess(PlatformPaySuccessRequest requestVo) {
+
+        BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
+        baseQueryOrderRequest.setOrderId(requestVo.getOrderCode());
+        baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+        QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+
+        if (!RESPONSE_SUCCESS_CODE.equals(queryOrderByIdResponse.getErrcode()) || queryOrderByIdResponse.getData() == null) {
+            return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
+        }
+        // 扣减储值卡
+        // 扣减券
+        // 扣减积分
+
+
+        return ResponseUtil.success();
+    }
+
     private String getRedpacketsPicture(String activityId) {
         if (StringUtils.isNotBlank(activityId)) {
             try {
@@ -1784,7 +1803,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         OrderBean orderBean = orderByIdResponseDto.getData();
         // todo coco 商户校验
-        if (partnerId.equals(orderByIdResponseDto.getData().getCompanyId())) {
+        if (cocoPartnerId.contains(orderByIdResponseDto.getData().getCompanyId())) {
             // COCO 即时单不可取消
             if ( NewOrderType.GENERAL_SELF_PICKUP.getCode().equals(queryOrderByIdResponse.getData().getNewOrderType())) {
                 return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR);

order-application-service/src/main/java/cn/freemud/service/order/OrderRelationService.java

@@ -27,7 +27,7 @@ public interface OrderRelationService {
 
 
     /**
-     * 创建订单的时间检查
+     * 订单详情编辑
      * @param
      */
     void queryOrdrBuild(QueryOrderResponseVo queryOrderResponseVo,QueryOrderByIdResponse response);

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

@@ -17,17 +17,23 @@ import cn.freemud.entities.dto.order.BusinessDate;
 import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.entities.vo.ProductVo;
 import cn.freemud.entities.vo.QueryOrderResponseVo;
+import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.CreateOrderType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.impl.CheckOrder;
 import cn.freemud.service.order.OrderRelationService;
+import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSendCouponResp;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
+import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
+import com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import io.swagger.models.auth.In;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -101,6 +107,19 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService {
             queryOrderResponseVo.setChooseGoods(chooseGoods);
         }
 
+        Map<String,QueryOrdersResponse.DataBean.OrderBean.ProductBean> productMap = new HashMap<>();
+        List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> productList = response.getData().getProductList();
+        if(productList != null && !productList.isEmpty()){
+            for(QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean : productList){
+                if(StringUtils.isEmpty(productBean.getExtInfo())){
+                    continue;
+                }
+
+                OrderProductAddInfoDto orderProductAddInfoDto = JSONObject.parseObject(productBean.getExtInfo(),OrderProductAddInfoDto.class);
+                productMap.put(orderProductAddInfoDto.getCartGoodsUid(),productBean);
+            }
+        }
+
 
         // 赠品合并到主商品
         List<ProductVo> products = queryOrderResponseVo.getProducts();
@@ -118,13 +137,58 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService {
             });
         }
 
+
+        List<ProductVo> productVos = new ArrayList<>();
         if(null != masterProducts && !masterProducts.isEmpty()){
-            masterProducts.forEach(product -> {
+            for(ProductVo product : masterProducts){
                 Integer giftQty = giftMap.get(product.getCid()) == null ? 0 : giftMap.get(product.getCid());
                 product.setQty(product.getQty() + giftQty);
-            });
+
+                // 商品原单价=商品原单价+小料原单价
+                List<ProductVo> smallMaterial = product.getSetMaterialProducts();
+                Long smallMaterialOriTotal = 0L;
+                if(smallMaterial != null && !smallMaterial.isEmpty()){
+                    for(ProductVo sm : smallMaterial){
+                        smallMaterialOriTotal = smallMaterialOriTotal + sm.getOriginalPrice();
+                    }
+                }
+                // 商品现单价 = 商品现单价+小料现单价
+                smallMaterialOriTotal = smallMaterialOriTotal == null ? 0 : smallMaterialOriTotal;
+                product.setOriginalPrice(smallMaterialOriTotal + (product.getOriginalPrice() == null ? 0L : product.getOriginalPrice()));
+
+
+
+                // 如果商品参加了第二件半价活动，要把该行拆成数量为1的多行
+                QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = productMap.get(product.getCid());
+                if(productBean == null || productBean.getDiscountList() == null || productBean.getDiscountList().isEmpty()){
+                    continue;
+                }
+                boolean halfFlag = false;
+                List<QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount> discountList = productBean.getDiscountList();
+                for(QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount productDiscount : discountList){
+                    if(ObjectUtils.equals(productDiscount.getDiscountType(), OldOrderAccountType.SECOND_DISCOUNT.getCode())){
+                        halfFlag = true;
+                        break;
+                    }
+                }
+                if(halfFlag){
+                    Integer  num = product.getQty();
+                    for(int i = 0 ; i < num-1 ; i++){
+                        ProductVo newProduct = JSONObject.parseObject(JSONObject.toJSONString(product),ProductVo.class);
+                        newProduct.setQty(1);
+
+                        productVos.add(newProduct);
+                    }
+
+                    product.setQty(1);
+                }
+
+            }
+
         }
 
+        masterProducts.addAll(productVos);
+
         queryOrderResponseVo.setProducts(masterProducts);
     }
 

order-application-service/src/test/java/cn.freemud/utils/DateUtilsTest.java

+package cn.freemud.utils;
+
+import cn.freemud.base.util.DateUtil;
+import org.apache.commons.lang.time.DateUtils;
+import org.junit.Test;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateUtilsTest {
+
+
+    @Test
+   public void testDateCompare() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date1 = sdf.parse("2020-12-30 00:00:00");
+        Date date2 = sdf.parse("2020-12-14 11:50:00");
+
+        System.out.println("date1 : " + sdf.format(date1));
+        System.out.println("date2 : " + sdf.format(date2));
+        System.out.println(date1.compareTo(date2));
+        if (date1.compareTo(date2) > 0) {
+            System.out.println("Date1 时间在 Date2 之后");
+        } else if (date1.compareTo(date2) < 0) {
+            System.out.println("Date1 时间在 Date2 之前");
+        } else if (date1.compareTo(date2) == 0) {
+            System.out.println("Date1 时间与 Date2 相等");
+        } else {
+            System.out.println("程序怎么会运行到这里?正常应该不会");
+        }
+
+         boolean x =(DateUtils.addMinutes(new Date(), 45).compareTo(date2) <= 0);
+        System.out.println(x);
+    }
+
+    @Test
+    public  void  testBefore() throws ParseException {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date1 = sdf.parse("2020-12-30 00:00:00");
+        Date date = DateUtil.setEndDay(new Date());
+        String s = DateUtil.convert2String(date, "yyyy-MM-dd HH:mm:ss");
+        System.out.println(date.before(date1));
+    }
+}

order-application-service/src/test/java/cn/freemud/amp/service/AuditScoreAccount.java

+package cn.freemud.amp.service;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Setter
+@Getter
+public class AuditScoreAccount {
+
+    /**
+     * 账本主键ID
+     */
+    private String accountId;
+
+    private String partnerId;
+
+    private String memberId;
+
+    /**
+     * 账本状态{1可使用 2已使用}
+     */
+    private Integer accountStatus;
+
+    /**
+     * 源积分值
+     */
+    private Integer originScore;
+
+    /**
+     * 剩余积分值
+     */
+    private Integer leftScore;
+
+    /**
+     * 到日日期{格式：yyyy-MM-dd}
+     */
+    private String expireDate;
+
+    /*
+    所属机构类型{1总公司2分公司3门店}
+     */
+    private Integer orgType;
+
+    /**
+     * 所属机构编码
+     */
+    private String orgCode;
+
+    /**
+     * 所属机构类型{1总公司2分公司3门店}
+     */
+    private Integer belongOrgType;
+
+    /**
+     * 所属机构编码
+     */
+    private String belongOrgCode;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    /**
+     * 是否删除{0表示否 1表示是}
+     */
+    private Integer isDel;
+
+    @Override
+    public String toString() {
+        return this.accountId;
+    }
+}
\ No newline at end of file

order-application-service/src/test/java/cn/freemud/amp/service/SortTest.java

+package cn.freemud.amp.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class SortTest {
+
+
+
+    public static void main(String[] args) {
+        List<AuditScoreAccount> list = new ArrayList<AuditScoreAccount>();
+
+        //创建3个学生对象，年龄分别是20、19、21，并将他们依次放入List中
+
+
+
+        AuditScoreAccount s1 = new AuditScoreAccount();
+        s1.setExpireDate("2020-01-02");
+        s1.setAccountId("1");
+        AuditScoreAccount s2 = new AuditScoreAccount();
+        s2.setExpireDate("2020-04-03");
+        s2.setAccountId("2");
+        AuditScoreAccount s3 = new AuditScoreAccount();
+        s3.setExpireDate("2020-03-01");
+        s3.setAccountId("3");
+
+        AuditScoreAccount s5 = new AuditScoreAccount();
+        list.add(s5);
+        list.add(s1);
+        list.add(s2);
+        list.add(s3);
+
+        System.out.println("排序前："+list);
+
+        List<String> stringList = new ArrayList<>();
+        stringList.add("3");
+        stringList.add("2");
+
+        Collections.sort(list, new Comparator<AuditScoreAccount>(){
+            /*
+             * int compare(Student o1, Student o2) 返回一个基本类型的整型，
+             * 返回负数表示：o1 小于o2，
+             * 返回0 表示：o1和o2相等，
+             * 返回正数表示：o1大于o2。
+             */
+            public int compare(AuditScoreAccount o1, AuditScoreAccount o2) {
+                if(stringList.contains(o2.getAccountId())){
+                    return 1;
+                }
+                if(stringList.contains(o1.getAccountId())){
+                    return -1;
+                }
+                if(o2.getExpireDate() ==null){
+                    return -1;
+                }
+                if(o1.getExpireDate() ==null){
+                    return 1;
+                }
+               return   o1.getExpireDate().compareTo(o2.getExpireDate());
+            }
+        });
+        System.out.println("排序后："+list);
+    }
+}

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.7.5-SNAPSHOT</version>
+    <version>1.7.8-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -46,4 +46,7 @@
 | 1.7.2-SNAPSHOT | coco订单详情赠品合并 | 刘鹏飞 | 2020-12-3 |
 | 1.7.3-SNAPSHOT|  抖音支付新增抖音单号和openId   | 张志恒 | 2020-12-4 |
 | 1.7.4-SNAPSHOT|  买一赠一寄件   | 刘鹏飞 | 2020-12-11 |
-| 1.7.5-SNAPSHOT|  抖音支付   | 张志恒 | 2020-12-11 |
+| 1.7.5-SNAPSHOT|  抖音支付   | 张志恒 | 2020-12-11 |
\ No newline at end of file
+| 1.7.6-SNAPSHOT|  拼单列表查询   | 缪晖 | 2020-12-22 |
+| 1.7.7-SNAPSHOT|  添加储值卡支付   | 梁崇福 | 2020-12-22 |
+| 1.7.8-SNAPSHOT|  抖音支付   | 张志恒 | 2020-12-22 |
\ No newline at end of file

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

@@ -119,5 +119,6 @@ public class OrderConditionsReq {
     private String appId;
     //是否删除
     private Integer isDeleted;
-
+    //营销活动类型
+    private Integer marketingType;
 }

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

@@ -187,5 +187,10 @@ public class OrderExtInfoDto {
      */
     private String stationId;
 
+    /**
+     * 线下订单储值卡支付金额
+     */
+    private Integer svcAmount;
+
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/PaySuccessResp.java

@@ -26,7 +26,7 @@ public class PaySuccessResp {
     //总排队人数
     private Integer queueNumber;
     //取餐码
-    private Integer pickUpGoodsNo;
+    private String pickUpGoodsNo;
     //门店订单序号
     private Integer daySeq;
 

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -30,6 +30,7 @@ import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
@@ -42,6 +43,9 @@ public class ShoppingCartConvertAdapter {
     private static final String ATTRIBUTEID = "attributeId";
     private static final String ATTRIBUTENAME = "attributeName";
 
+    @Value("${mccafe.tableware.skuId}")
+    private String mcCafeTablewareSkuId;
+
     public ShoppingCartGoodsDto.CartGoodsDetailDto getCartGoodsDetailDto(CreateOrderVo.PremiumExchangeActivity.Product product, GetProductsVo getProductsVo, String goodsId, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods) {
         ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
         cartGoodsDetailDto.setOriginalPrice(getProductsVo.getFinalPrice());
@@ -121,6 +125,9 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setSpecialExtra(cartGoods.getSpecialExtra());
         cartGoodsDetailDto.setClassificationId(cartGoods.getClassificationId());
         cartGoodsDetailDto.setClassificationName(cartGoods.getClassificationName());
+        if(mcCafeTablewareSkuId.equals(cartGoods.getSkuId())) {
+            cartGoodsDetailDto.setIsTableware(1);
+        }
         if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
         } else if (cartGoods.isWeightType()) {

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -13,12 +13,11 @@
 package cn.freemud.controller;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.dto.GetMemberInfoRequestDto;
 import cn.freemud.entities.vo.*;
-import cn.freemud.enums.CreateOrderType;
 import cn.freemud.enums.OrderChannelType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.service.ShoppingCartNewService;
-import cn.freemud.service.ShoppingCartToolsService;
 import cn.freemud.service.impl.ShoppingCartMallServiceImpl;
 import cn.freemud.service.impl.ShoppingCartMealServiceImpl;
 import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
@@ -28,7 +27,6 @@ import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
-import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.Api;
@@ -177,4 +175,14 @@ public class ShoppingCartController {
         return SDKCommonBaseContextWare.getBean(ShoppingCartToolsServiceImpl.class).clear(request);
     }
 
+
+    /**
+     * 线下订单查询接口
+     */
+    @ApiAnnotation(logMessage = "/getMemberInfo")
+    @PostMapping(value = "/getMemberInfo")
+    public BaseResponse getMemberInfo(@LogParams @RequestBody GetMemberInfoRequestDto request) {
+        return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).getMemberInfo(request);
+    }
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetMemberInfoRequestDto.java

+package cn.freemud.entities.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetMemberInfoRequestDto {
+
+    private String partnerId;
+
+    private String mobile;
+
+    private String userId;
+
+
+    /**
+     * 实际支付金额（分）
+     */
+    private Integer actualPayAmount;
+
+    /**
+     * 下单门店号
+     */
+    private String storeId;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 订单原金额（分）
+     */
+    private Integer originalAmount;
+
+    /**
+     * 下单渠道
+     */
+    private Integer orderClient;
+
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+
+    /**
+     * 支付渠道
+     */
+    private String payChannel;
+
+    /**
+     * 支付渠道名称
+     */
+    private String payChannelName;
+
+    /**
+     * pos编号
+     */
+    private String posCode;
+    /**
+     * 操作人
+     */
+    private String operator;
+    /**
+     * 是否赠送积分 0是1否
+     */
+    private Integer needBonus;
+
+    /**
+     * 订单商品信息
+     */
+    private List<OrderItemRequest> orderItemList;
+
+    @Data
+    public static class OrderItemRequest {
+
+        /**
+         * 商品序号
+         */
+        private Integer productSeq;
+
+        /**
+         * 平台商品编号
+         */
+        private String productId;
+
+        /**
+         * 商家商品编号
+         */
+        private String thirdProductId;
+
+        /**
+         * 商品名称
+         */
+        private String productName;
+
+        /**
+         * 商品单价（分）
+         */
+        private Integer productPrice;
+
+        /**
+         * 数量
+         */
+        private Integer productQuantity;
+
+        /**
+         * 优惠分摊金额（分）
+         */
+        private Integer productSharePrice;
+
+        /**
+         * 商品单位
+         */
+        private String productWeightUnit;
+
+        /**
+         * 商品重量（克）
+         */
+        private Integer weight;
+
+        /**
+         * 商品规格名称（大杯）
+         */
+        private String productSpecName;
+
+        /**
+         * 商品属性名称（三分糖）
+         */
+        private String productProperty;
+
+        /**
+         * 商家商品分类编号
+         */
+        private String thirdCateCode;
+
+        /**
+         * 是否算积分
+         */
+        private String needBonus;
+
+
+    }
+
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetMemberInfoResponseVo.java

+package cn.freemud.entities.dto;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetMemberInfoResponseVo {
+
+    private String userId;
+
+    private Score score;
+
+    private List<Coupon> coupons;
+
+    private List<Card> cards;
+
+    @Data
+    public static class Score {
+
+        /**
+         * 当前可用积分
+         */
+        private Integer currentScore;
+        /**
+         * 积分抵扣金额，单位分
+         */
+        private Integer reduceAmount;
+
+        /**
+         * 抵扣积分
+         */
+        private Integer reduceScore;
+
+    }
+
+    @Data
+    public static class Coupon {
+
+        /**
+         * 券名称
+         */
+        private String couponName;
+
+        /**
+         * 券CODE
+         */
+        private String couponCode;
+
+        /**
+         * 券类型 0：商品 券 1：代金券 3 折扣券
+         */
+        private Integer cuoponType;
+
+        /**
+         * 如：2019-10-1 至 2019-10-10 当天有效
+         */
+        private String couponLimit;
+
+        /**
+         * 优惠金额,单位分
+         */
+        private Integer discountAmount;
+
+        /**
+         * 状态：-1:未激活 0:可用(剔除过期) 1:已使用 2:部分使用 3:取消 6:已过期(根据生失效日期) 99：未知（目前暂不支持）
+         */
+        private Integer status;
+
+        private List<Product> products;
+
+    }
+
+    @Data
+    public static class Product {
+
+        /**
+         * 商户商品编号
+         */
+        private String pid;
+
+        /**
+         * 商品名称
+         */
+        private String name;
+
+        /**
+         * 最大可取商品个数
+         */
+        private Integer number;
+
+        /**
+         * 商品折扣价，以分为单位
+         */
+        private Integer priceAct;
+
+        /**
+         * 原价，以分为单位
+         */
+        private Integer priceOriginal;
+
+        /**
+         * 支付信息
+         */
+        Payment payment;
+
+    }
+
+    @Data
+    public static class Payment {
+
+        /**
+         * 线上已付金额，以分为单位
+         */
+        private Integer paid;
+
+        /**
+         * 线下需要收取的金额，以分为单位
+         */
+        private Integer remaining;
+
+    }
+
+    @Data
+    public static class Card {
+
+        /**
+         * 实充余额，单位分
+         */
+        private Integer amount;
+
+        /**
+         * 赠送余额，单位分
+         */
+        private Integer vamount;
+
+        /**
+         * 卡规格ID
+         */
+        private String applyId;
+
+        /**
+         * 卡号
+         */
+        private String cardCode;
+
+        /**
+         * 卡名称
+         */
+        private String cardName;
+
+    }
+}

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationSharingDiscountResponseDto.java

@@ -266,6 +266,11 @@ public class CalculationSharingDiscountResponseDto {
                  * 当前活动实际优惠的商品数量
                  */
                 private Integer actualGoodsNumber;
+
+                /**
+                 * 优惠现单价
+                 */
+                private Long signleDiscount;
             }
 
             /**

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -255,6 +255,10 @@ public class ShoppingCartGoodsDto {
          */
         private boolean isStockLimit;
         /**
+         * 是否餐具商品
+         */
+        private Integer isTableware = 0;
+        /**
          * 商品货号
          */
         private String productCode;

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -196,6 +196,10 @@ public class CartGoods {
      */
     private boolean isStockLimit;
     /**
+     * 是否餐具商品
+     */
+    private Boolean isTableware = false;
+    /**
      * 第三方商品编码
      */
     private String customerCode;

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartClearRequestVo.java

@@ -36,4 +36,11 @@ public class ShoppingCartClearRequestVo extends BaseRequestVo {
      * 拼单发起人userId（拼单）
      */
     private String createCollageUserId;
+
+
+    /**
+     * 收货地址ID、svc卡支付外卖订单必传
+     */
+    private String receiveId;
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -25,6 +25,7 @@ public enum ActivityTypeEnum {
      */
     TYPE_2(2, "单品特价"),
     TYPE_21(21, "单品折扣"),
+    TYPE_22(22, "单品立减"),
     TYPE_23(23, "超值加购"),
     /**
      * 优惠券

shopping-cart-application-service/src/main/java/cn/freemud/service/ShoppingCartNewService.java

@@ -18,9 +18,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -101,6 +99,10 @@ public interface ShoppingCartNewService {
 
     List<CartGoods> updateCartGoodsLegal(CartGoods cartGoods, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<CartGoods> oldAllCartGoodsList);
 
+    default BaseResponse<GetMemberInfoResponseVo> getMemberInfo(GetMemberInfoRequestDto request){
+        return null;
+    };
+
     /**
      * 商品券校验券是否有效
      *

shopping-cart-application-service/src/main/java/cn/freemud/service/active/impl/CocoActiveServiceImpl.java

@@ -147,6 +147,7 @@ public class CocoActiveServiceImpl implements ActiveService {
                 newCartGoods.setClassificationName(cgs.getClassificationName());
                 newCartGoods.setActivityType(discount.getType());
                 newCartGoods.setQty(discountForGift.get(cgs.getCartGoodsUid()).getGoodsQuantity());
+                newCartGoods.setProductMaterialList(cgs.getProductMaterialList());
                 addcartGoodsList.add(newCartGoods);
             }
         }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java

@@ -10,6 +10,7 @@ import cn.freemud.entities.dto.shoppingCart.SendPoint;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.*;
+import cn.freemud.interceptor.BizServiceException;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
 import cn.freemud.service.CouponService;
@@ -200,7 +201,7 @@ public class CalculationSharingDiscountService {
 
         // 这个是专门给coco使用的券验证错误的异常，message要抛出去
         if(sharingDiscountResponseDto != null && StringUtils.equals(sharingDiscountResponseDto.getStatusCode(), ResponseCodeConstant.COCO_RESPONSE_COUPON_ERR_STR)){
-            throw new ServiceException(ResponseResult.COCO_COUPON_VALIDATOR_FAIL,sharingDiscountResponseDto.getMsg());
+            throw new BizServiceException(ResponseResult.COCO_COUPON_VALIDATOR_FAIL,sharingDiscountResponseDto.getMsg());
         }
 
         // 支付宝华莱士紧急修改代码，当促销返回103错误码时，需要报券不适用于该门店，且清空购物车

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/ShoppingCartRelationFactory.java

@@ -20,4 +20,11 @@ public interface ShoppingCartRelationFactory {
      */
     ShoppingCartRelationService getBuildShoppingCartGoodsResponseService(String partnerId);
 
+    /**
+     * 获取购物车清空后的操作实现
+     * @param partnerId
+     * @return
+     */
+    ShoppingCartRelationService cleanAfter(String partnerId);
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/ShoppingCartRelationService.java

@@ -13,6 +13,7 @@
 package cn.freemud.service.shoppingCart;
 
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
+import cn.freemud.entities.vo.ShoppingCartClearRequestVo;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 
 public interface ShoppingCartRelationService {
@@ -24,5 +25,10 @@ public interface ShoppingCartRelationService {
                                         CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
                                         Integer flag);
 
+    /**
+     * 购物车清空后的扩展操作
+     */
+    void cleanAfter(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartClearRequestVo shoppingCartClearRequestVo);
+
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/PlatformShoppingCartRelationServiceImpl.java

@@ -13,6 +13,7 @@
 package cn.freemud.service.shoppingCart.impl;
 
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
+import cn.freemud.entities.vo.ShoppingCartClearRequestVo;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
 import org.springframework.stereotype.Service;
@@ -26,4 +27,9 @@ public class PlatformShoppingCartRelationServiceImpl implements ShoppingCartRela
                                                Integer flag) {
 
     }
+
+    @Override
+    public void cleanAfter(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartClearRequestVo shoppingCartClearRequestVo) {
+
+    }
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/ShoppingCartRelationFactoryImpl.java

@@ -54,4 +54,13 @@ public class ShoppingCartRelationFactoryImpl implements ShoppingCartRelationFact
         }
     }
 
+    @Override
+    public ShoppingCartRelationService cleanAfter(String partnerId) {
+        if(cocoPartnerId.contains(partnerId)){
+            return cocoShoppingCartRelationService;
+        }else{
+            return platformShoppingCartRelationService;
+        }
+    }
+
 }

shopping-cart-application-service/src/main/resources/application.properties

@@ -21,6 +21,4 @@ management.endpoints.web.exposure.include=prometheus,info,health,shutdown
 management.metrics.tags.application=${spring.application.name}
 management.endpoint.shutdown.enabled=true
 management.security.enabled=false
-management.health.rabbit.enabled=false
-
+management.health.rabbit.enabled=false
\ No newline at end of file
-