Merge remote-tracking branch 'origin/20201125-coco-zhw' into 20201125-coco-zhw

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

@@ -66,6 +66,13 @@ public class OrderPayResponse {
     private String payMode;
     private List<PayItem> payItem = new ArrayList<>();
 
+    // 回调地址
+    private String payNotifyUrl;
+    //商户id
+    private String sellerId;
+    // 支付类型：机场支付=20099
+    private String ebCode;
+
     @NoArgsConstructor
     @Data
     public static class PayOrderBean {
@@ -97,6 +104,8 @@ public class OrderPayResponse {
         private String signType;
 
         private String aliPayOrder;
+
+
     }
 
 }

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

@@ -2881,6 +2881,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/service/impl/OrderServiceImpl.java

@@ -1664,18 +1664,14 @@ public class OrderServiceImpl implements Orderservice {
         if (cocoPartnerId.contains(orderByIdResponseDto.getData().getCompanyId())) {
             // COCO 即时单不可取消
             if ( NewOrderType.GENERAL_SELF_PICKUP.getCode().equals(queryOrderByIdResponse.getData().getNewOrderType())) {
-                return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR);
+                return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND);
             }
             // 4,6 预约单
             List<Integer> expectOrderType = Lists.newArrayList(
                     NewOrderType.RESERVED_EXPRESS.getCode(),
                     NewOrderType.RESERVED_SELF_PICKUP.getCode());
             long time = DateUtil.addMinutes(new Date(), 15).getTime();
-            if (expectOrderType.contains(queryOrderByIdResponse.getData().getNewOrderType())
-                    && Objects.nonNull(orderBean.getGmtExpect())
-                    && time > orderBean.getGmtExpect()) {
-                return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR_EXPECT_TIME);
-            }
+
             // 外卖单
             List<Integer> takeOrderType = Lists.newArrayList(
                     NewOrderType.RESERVED_EXPRESS.getCode(),
@@ -1686,6 +1682,18 @@ public class OrderServiceImpl implements Orderservice {
                     && taskCancelOrderTime > queryOrderByIdResponse.getData().getEstimateDeliveryCompleteTime()) {
                 return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR_ESTIMATE_TIME);
             }
+            if (expectOrderType.contains(queryOrderByIdResponse.getData().getNewOrderType())){
+                if (Objects.nonNull(orderBean.getGmtExpect())
+                        && time > orderBean.getGmtExpect()) {
+                    return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR_EXPECT_TIME);
+                }
+                // todo coco 预约单直接退款
+                BaseResponse baseResponse =  partnerNoTakeOrder(orderRefundVo, orderBean, orderId, AfterSalesType.USER_CANCEL, true);
+                if (baseResponse != null) {
+                    return baseResponse;
+                }
+            }
+
         }
         /**
          * 已接单，制作完成，配送中,未接单，用户可申请退款

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);
+    }
+}