Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'master' of…

Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -619,6 +619,7 @@ public class OrderSdkAdapter {
         orderConditionsReq.setUserId(queryOrdersRequest.getUserId());
         orderConditionsReq.setPageSize(queryOrdersRequest.getPageSize());
         orderConditionsReq.setPageNum(queryOrdersRequest.getPageNumber());
+        orderConditionsReq.setNeedInvoice(queryOrdersRequest.getNeedInvoice());
 
         List<Integer> orderStatus = new ArrayList<>();
         if (queryOrdersRequest.getStatus() != null && queryOrdersRequest.getStatus().length != 0) {
@@ -1345,6 +1346,7 @@ public class OrderSdkAdapter {
         // 设置 额外拓展字段信息
         OrderExtendedReq orderExtended =  this.getOrderExtendedObj(orderInfoReqs.getOrderExtended());
         data.setOrderExtended(orderExtended);
+        data.setNeedInvoice(orderInfoReqs.getNeedInvoice());
         return data;
     }
 

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

@@ -59,4 +59,13 @@ public class QueryOrdersRequest extends BaseConfig {
 
     private List<Integer> bizTypes;
 
+    /**
+     * 是否已开发票，false查询可开票订单，true查询其他订单（包含已开票/已退款订单）
+     */
+    private Boolean needInvoice;
+
+    /**
+     * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
+     */
+    private Integer marketingType;
 }

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

@@ -1321,6 +1321,7 @@ public class OrderAdapter {
             //取餐码用日订单序号代替- v1.5.4变更为四位随机数
             responseVo.setTakeCode(ordersBean.getOtherCode());
             responseVo.setAmount(ordersBean.getAmount());
+            responseVo.setActualPayAmount(ordersBean.getActualPayAmount());
             OrderViewStatusDto orderViewStatusDto = getOrderViewStatusDesc(ordersBean, wxAppId);
             //围餐需求  订单中存在未称重的商品称重商品则金额为0
             if (IappIdType.WC_XCX.getCode().equals(iAppId)) {
@@ -1559,6 +1560,8 @@ public class OrderAdapter {
                 responseVo.setUserPhone(orderExtended.getUserPhone());
                 responseVo.setSendWord(orderExtended.getSendWord());
             }
+            //是否已开发票
+            responseVo.setNeedInvoice(orderBean.getNeedInvoice());
             list.add(responseVo);
         }
 

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

@@ -3,6 +3,7 @@ package cn.freemud.adapter;
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.CreateSpellGroupOrderDto;
 import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateRequest;
+import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateResponse;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
 import cn.freemud.entities.dto.product.ProductInfo;
 import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
@@ -27,6 +28,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author wanghanghang
@@ -66,8 +68,10 @@ public class SpellGroupOrderAdapter {
         //运费
         long freight = 0 ;
         //判断是否包邮，包邮的话运费为0
-        if (createSpellGroupOrderDto.getDeliveryTemplateInfo().getIsDispatchFree() == false) {
-            freight = createSpellGroupOrderDto.getDeliveryTemplateInfo().getFreight();
+        //判断是否包邮，包邮的话运费为0
+        QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfo = createSpellGroupOrderDto.getDeliveryTemplateInfo();
+        if (deliveryTemplateInfo != null && Objects.equals(deliveryTemplateInfo.getCostType(),0)) {
+            freight = deliveryTemplateInfo.getFreight() == null? 0: deliveryTemplateInfo.getFreight();
         }
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscount = createSpellGroupOrderDto.getCalculationDiscount();
         createOrderRequest.setActualPayAmount(calculationDiscount.getTotalAmount().longValue() + freight); //加配送费

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

@@ -58,4 +58,9 @@ public class QueryOrdersDto {
 
     private List<Integer> bizTypes;
 
+    /**
+     * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
+     */
+    private Integer marketingType;
+
 }

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

 package cn.freemud.entities.dto.delivery;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -21,13 +22,14 @@ public class QueryDeliveryTemplateResponse {
     @Data
     public static class DeliveryTemplateInfoVo {
 
-        /**
-         * 运费
-         */
-        private Long freight;
-        /**
-         * 是否包邮 -> true:是; false:否
-         */
-        private Boolean isDispatchFree;
+//        @ApiModelProperty(value = "是否包邮 -> true:是; false:否 （过期，后期通过costType字段）")
+//        @Deprecated
+//        private Boolean isDispatchFree;
+
+        @ApiModelProperty(value = "配送类型类型 -> 0:不包邮; 1:包邮; 2:运费到付")
+        private Integer costType;
+
+        @ApiModelProperty(value = "运费 单位：分")
+        private Integer freight;
     }
 }

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

@@ -93,6 +93,10 @@ public class QueryOrderResponseVo {
      * 订单金额
      */
     private Long amount;
+    /*
+     * 实际支付金额,可开票金额
+     */
+    private Long actualPayAmount;
     /**
      * 商品总金额 不包括满减，配送费，包装费
      */
@@ -658,4 +662,7 @@ public class QueryOrderResponseVo {
      * 【订单聚合层】总部和区域活动可同时生效 直接反馈促销给的活动数据
      */
     private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;
+
+    //是否已开票，true已开票，默认false未开票
+    private Boolean needInvoice;
 }

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

@@ -95,4 +95,9 @@ public class QueryOrderVo {
      */
     private Integer marketingType;
 
+    /**
+     * 是否已开发票，false查询可开票订单，true查询其他订单（包含已开票/已退款订单）,查询实际支付金额大于0的
+     */
+    private Boolean needInvoice;
+
 }

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

@@ -489,6 +489,10 @@ public class MallOrderServiceImpl implements MallOrderService {
             AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
             GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,userLoginInfoDto,wxappid);
             if(!ResponseResult.SUCCESS.getCode().equals(groupWorkJoinResponse.getStatusCode()) || groupWorkJoinResponse.getResult() == null){
+                // fisherman 如果响应码是800 表示订单重复参与-> 有可能是因为支付回调了两次接口 直接返回成功
+                if ("800".equals(groupWorkJoinResponse.getStatusCode())) {
+                    return gson.toJson(message);
+                }
                 orderRefund(orderBean, groupWorkJoinResponse.getMsg());
                 backOrdersNotifyActivity(orderBean, backOrdersChangeOrderStatusConsumerQueue, backOrdersNotifyActivityExchange);
                 return gson.toJson(message);

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

@@ -851,7 +851,12 @@ public class OrderServiceImpl implements Orderservice {
             if (isQueryEs(queryOrderVo.getQueryOrderStatus()) && queryOrderEs) {
                 queryOrderVo.setStartDate(DateUtil.convert2String(DateUtil.addMonths(new Date(), -3), "yyyy-MM-dd"));
             } else {
-                queryOrderVo.setStartDate(DateUtil.convert2String(DateUtil.addMonths(new Date(), -1), "yyyy-MM-dd"));
+                //只有发票相关的查询2个月
+                if(queryOrderVo.getNeedInvoice() != null){
+                    queryOrderVo.setStartDate(DateUtil.convert2String(DateUtil.addMonths(new Date(), -2), "yyyy-MM-dd"));
+                }else {
+                    queryOrderVo.setStartDate(DateUtil.convert2String(DateUtil.addMonths(new Date(), -1), "yyyy-MM-dd"));
+                }
             }
 
         }
@@ -901,6 +906,10 @@ public class OrderServiceImpl implements Orderservice {
             QueryOrdersRequest queryOrdersRequest2 = new QueryOrdersRequest();
             BeanUtil.convertBean(queryOrdersDto, queryOrdersRequest2);
             queryOrdersRequest2.setTrackingNo(LogThreadLocal.getTrackingNo());
+            queryOrdersRequest2.setNeedInvoice(queryOrderVo.getNeedInvoice());
+            if(Objects.equals(QueryOrderStatus.REFUND_BILL.getCode(),queryOrderVo.getQueryOrderStatus())){
+                queryOrdersRequest2.setPayStatus(new Integer[]{3});//发票其他订单查询已退款
+            }
             // 订单要查3个月的，如果查询的订单状态是待取餐、未支付，则查实时，否则，查es
             if (isQueryEs(queryOrderVo.getQueryOrderStatus()) && queryOrderEs) {
                 OrderConditionsReq es = new OrderConditionsReq();
@@ -912,7 +921,7 @@ public class OrderServiceImpl implements Orderservice {
                 es.setPageSize(queryOrderVo.getPageSize());
                 es.setMarketingType(queryOrderVo.getMarketingType());
                 OrderConditionsReq queryEs = orderAdapter.convent2QueryOrdersDtoES(es, userId, channelType, queryOrderVo.getQueryOrderStatus(), queryOrderVo.getQueryOrderType(), queryOrderVo.getQueryPayStatus());
-
+                queryEs.setNeedInvoice(queryOrderVo.getNeedInvoice());
                 BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(queryEs, LogThreadLocal.getTrackingNo());
 
                 queryOrderResponse = orderAdapter.conventEs2queryOrderResponse(response);

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

@@ -203,8 +203,8 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
             return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR);
         }
         QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = queryDeliveryTemplateResponse.getData();
-        if(deliveryTemplateInfoVo.getIsDispatchFree() == true){
-            deliveryTemplateInfoVo.setFreight((long) 0);
+        if (deliveryTemplateInfoVo!= null && deliveryTemplateInfoVo.getCostType().compareTo(0) !=0) {
+            deliveryTemplateInfoVo.setFreight(0);
         }
 //        QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfoVo = new QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo();
 //        deliveryTemplateInfoVo.setFreight(1L);

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

@@ -138,4 +138,9 @@ public class OrderConditionsReq {
 
     // 快递单号
     private String expressNo;
+
+    /**
+     * 是否已开发票，false查询可开票订单，true查询其他订单（包含已开票/已退款订单）
+     */
+    private Boolean needInvoice;
 }

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

@@ -55,4 +55,14 @@ public class OrderUserConditionsReq {
     //订单类型集合
     private List<Integer> bizTypes;
 
+    /**
+     * 是否已开发票，false查询可开票订单，true查询其他订单（包含已开票/已退款订单）
+     */
+    private Boolean needInvoice;
+
+    /**
+     * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
+     */
+    private Integer marketingType;
+
 }

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

@@ -205,7 +205,7 @@ public class OrderInfoReqs {
     private BigDecimal actualPayAmount;
 
     /**
-     * 是否需要开发票
+     * 是否已开票，true已开票，默认false未开票
      */
     private Boolean needInvoice;