Merge remote-tracking branch 'origin/feature/20211021_加价购支持虚拟商品' into feature/20211021_加价购支持虚拟商品

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

@@ -3126,6 +3126,10 @@ public class OrderSdkAdapter {
             extInfo.setNeedBonus(product.getNeedBonus());
         }
 
+        if (product.getExtInfo() != null) {
+            extInfo.setProductBindingCoupons(JSONArray.parseArray(product.getExtInfo(),ProductBindingCouponType.class));
+        }
+
         orderItemCreateReq.setExtInfo(JSONObject.toJSONString(extInfo));
 
         // 拼单加购人信息 add by miaohui 2020.10.12 start

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

@@ -271,4 +271,6 @@ public class CreateOrderProductRequest extends BaseConfig {
 
     //积分商品活动使用总积分
     private Long score;
+
+    private String extInfo;
 }

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

@@ -2143,6 +2143,18 @@ public class OrderAdapter {
            return this.checkAdvanceOrder(orderBean.getGmtExpect());
         }
 
+        // 加价购选择虚拟商品券包，订单完成前可申请退款，完成之后不能申请退款
+        if (OrderStatus.COMPLETE.equals(status) && CollectionUtils.isNotEmpty(orderBean.getProductList())) {
+            for (ProductBeanV1 productBeanV1 : orderBean.getProductList()){
+                if(StringUtils.isNotEmpty(productBeanV1.getExtInfo())){
+                    OrderProductAddInfoDto extInfo = JSONObject.parseObject(productBeanV1.getExtInfo(), OrderProductAddInfoDto.class);
+                    if(CollectionUtils.isNotEmpty(extInfo.getProductBindingCoupons())){
+                        return false;
+                    }
+                }
+            }
+        }
+
         boolean canRefund = false;
         String hkey = OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType()) ? KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT : KgdRedisKeyConstant.REFUND_CFG_EAT_IN;
         String configStr = redisCache.hashGet(MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, orderBean.getCompanyId(), wxAppId), hkey);
@@ -2837,6 +2849,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setCartGoodsUid(cartGoodsDetailDto.getCartGoodsUid());
         createOrderProductDemoDto.setOriginalGoodsUid(cartGoodsDetailDto.getOriginalGoodsUid());
         createOrderProductDemoDto.setScore(cartGoodsDetailDto.getScore());
+        createOrderProductDemoDto.setExtInfo(cartGoodsDetailDto.getExtInfo());
         return createOrderProductDemoDto;
     }
 
@@ -4579,4 +4592,35 @@ public class OrderAdapter {
         }
         return orderCompareAfterSaleOrder;
     }
+
+
+    /**
+     * 获取订单信息
+     *
+     * @param orderStatus
+     * @return
+     */
+    public String getOrderStatusValue(Integer orderStatus) {
+        String name = "";
+        switch (orderStatus) {
+            case 1: {
+                name = "待审核";
+                break;
+            }
+            case 6: {
+                name = "审核通过";
+                break;
+            }
+            case 7: {
+                name = "审核未通过";
+                break;
+            }
+            case 8: {
+                name = "撤单";
+                break;
+            }
+        }
+        return name;
+    }
+
 }

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

@@ -337,6 +337,8 @@ public class ShoppingCartGoodsDto {
          */
         private String originalGoodsUid;
 
+        private String extInfo;
+
         @Data
         public final static class CartGoodsExtra {
             /**

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

@@ -229,7 +229,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
         }
         //更新库存等信息
         BaseOrderResponse baseOrderResponse = updateStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
-                config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest(),config.getBaseCreateOrderRequest().getMenuType(),config.getOpenId(),config.getBaseCreateOrderRequest().getTotalScore());
+                config.getBaseCreateOrderRequest().getAccounts(), config.getBaseCreateOrderRequest().getMenuType(),config.getOpenId(),config.getBaseCreateOrderRequest().getTotalScore());
         if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
             return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
         }
@@ -264,7 +264,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
      * @return
      */
     private BaseOrderResponse updateStockAndScore(OrderBeanV1 orderBean, List<CreateOrderProductRequest> products, ActivityUpdateStockRequest updateStockRequest,
-                                                  List<CreateOrderAccountRequest> accounts, MqMessageRequest mqMessageRequest, String menuType, String openId,Long totalScore) {
+                                                  List<CreateOrderAccountRequest> accounts, String menuType, String openId,Long totalScore) {
         //TODO 转换获取库存信息,扣减库存
         UpdateStocksRequest updateStocksRequest = orderSdkAdapter.getUpdateProductStock(orderBean, products, StockChangeType.REDUCE,menuType);
         if (updateStocksRequest != null && CollectionUtils.isNotEmpty(updateStocksRequest.getProductStocks())) {

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

@@ -730,10 +730,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         CreateOrderRequest createOrderRequest = new CreateOrderRequest();
         baseCreateOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         createOrderRequest.setBaseCreateOrderRequest(baseCreateOrderRequest);
-        MqMessageRequest mqMessageRequest = new MqMessageRequest();
-        mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
-        mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
-        createOrderRequest.setMqMessageRequest(mqMessageRequest);
         createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         return mcCafeOrderCenterSdkService.createMCCafeOrderFlow(createOrderRequest);
     }

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

@@ -285,10 +285,6 @@ public class MallOrderServiceImpl implements MallOrderService {
             CreateOrderRequest createOrderRequest = new CreateOrderRequest();
             baseCreateOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
             createOrderRequest.setBaseCreateOrderRequest(baseCreateOrderRequest);
-            MqMessageRequest mqMessageRequest = new MqMessageRequest();
-//            mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
-//            mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
-            createOrderRequest.setMqMessageRequest(mqMessageRequest);
             createOrderRequest.getBaseCreateOrderRequest().setUserName(userLoginInfoDto.getNickName());
             createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
             return orderBusinessService.createOrderFlow(createOrderRequest);

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

@@ -139,6 +139,9 @@ public class PayServiceImpl {
     @Value("${collage.pre_order_pay.goods_tag}")
     private String collageGoodsTag;
 
+    @Value("${query.pay.order:true}")
+    private Boolean queryPayOrder;
+
 
     private static final Integer MULITI_RESPONSE = 200;
     private static final String SUCCESS = "SUCCESS";
@@ -802,6 +805,9 @@ public class PayServiceImpl {
     public boolean closePrePay(OrderBeanV1 orderBean) {
         //是否支付成功
         boolean paySuccess = false;
+        if(!queryPayOrder){
+            return paySuccess;
+        }
         OrderExtInfoDto extInfo = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);
 
         List<OrderPayItemResp> orderPayItemList = orderBean.getOrderPayItem();

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

@@ -98,11 +98,6 @@ public class MCCafeOrderCenterSdkServiceImpl implements MCCafeOrderCenterSdkServ
                 || createOrderResponse.getData() == null) {
             return getCreateOrderResponse(createOrderResponse.getErrcode().toString(), createOrderResponse.getErrmsg(), null);
         }
-        BaseOrderResponse baseOrderResponse = updateMCCafeStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
-                config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest(),config.getBaseCreateOrderRequest().getMenuType());
-        if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
-            return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
-        }
         return createOrderResponse;
     }
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/OrderServiceClient.java

@@ -2,9 +2,11 @@ package cn.freemud.service.thirdparty;
 
 import cn.freemud.annotations.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.dto.QueryInvoiceRepDto;
 import cn.freemud.entities.dto.order.QueryInvoiceByCodesResponse;
 import cn.freemud.entities.dto.pay.OrderInvoiceRequest;
 import cn.freemud.entities.dto.pay.QueryInvoiceByCodesRequest;
+import cn.freemud.entities.vo.QueryInvoiceReq;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +26,16 @@ public interface OrderServiceClient {
     /**
      * 查询用户订单号是否已开票
      */
-    @LogIgnoreFeign(logMessage="queryByCodes")
+    @LogIgnoreFeign(logMessage="queryInvoiceByCodes")
     @PostMapping("/order/v2/invoice/queryByCodes")
     BaseResponse<QueryInvoiceByCodesResponse> queryInvoiceByCodes(@RequestBody QueryInvoiceByCodesRequest request);
+
+    /**
+     * 2021年9月15日-开票历史列表接口+详情接口+发票所含订单接口-黄兆良
+     * 开票历史列表接口
+     */
+    @LogIgnoreFeign(logMessage="queryInvoiceList")
+    @PostMapping(value = "/order/v2/invoice/list/forUser")
+    QueryInvoiceRepDto queryInvoiceList(@RequestBody QueryInvoiceReq queryInvoiceReq);
+
 }

order-application-service/src/test/java/cn.freemud/client/CustomerExtendClientTest.java

@@ -30,6 +30,6 @@ public class CustomerExtendClientTest {
         requestDto.setStatusFlags(new ArrayList<>(0));
         requestDto.setIsProduct(1);
         requestDto.setCouponType(0);
-        GetMemberCouponListResponseDto responseDto=customerExtendClient.getMemberCouponListRequestDto(requestDto);
+//        GetMemberCouponListResponseDto responseDto=customerExtendClient.getMemberCouponListRequestDto(requestDto);
     }
 }