Merge branches 'develop' and 'feature/20191216_记录订单操作人_wuping' of…

Merge branches 'develop' and 'feature/20191216_记录订单操作人_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -2482,6 +2482,7 @@ public class OrderSdkAdapter {
         assortmentGroupUpdateOrderRequest.setSettlementAmount(updateOrderProductInfoRequest.getSettlementAmount());
         assortmentGroupUpdateOrderRequest.setUserId(updateOrderProductInfoRequest.getUserId());
         assortmentGroupUpdateOrderRequest.setUserName(updateOrderProductInfoRequest.getUserName());
+        assortmentGroupUpdateOrderRequest.setOperator(updateOrderProductInfoRequest.getUserName());
         return assortmentGroupUpdateOrderRequest;
     }
 

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

@@ -2378,7 +2378,8 @@ public class OrderAdapter {
     /**
      * 购物车信息转换
      */
-    public AssortmentSdkUpdateOrderProductInfoRequest conventShoppingCartGoodsDtoByUpdate(ShoppingCartGoodsDto shoppingCartGoodsDto, AssortmentCustomerInfoVo assortmentCustomerInfoVo, String orderId, Integer dinersNumber) {
+    public AssortmentSdkUpdateOrderProductInfoRequest conventShoppingCartGoodsDtoByUpdate(ShoppingCartGoodsDto shoppingCartGoodsDto,
+            AssortmentCustomerInfoVo assortmentCustomerInfoVo, String orderId, Integer dinersNumber,String nickName) {
         AssortmentSdkUpdateOrderProductInfoRequest orderProductInfoRequest = new AssortmentSdkUpdateOrderProductInfoRequest();
         orderProductInfoRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
         orderProductInfoRequest.setStoreId(assortmentCustomerInfoVo.getStoreId());
@@ -2397,6 +2398,7 @@ public class OrderAdapter {
             }
         }
         orderProductInfoRequest.setOrderItemList(createOrderProductRequests);
+        orderProductInfoRequest.setOperator(nickName);
         orderProductInfoRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         return orderProductInfoRequest;
     }
@@ -2421,6 +2423,7 @@ public class OrderAdapter {
         sdkUpdateOrderProductInfoRequest.setSettlementAmount(shoppingCartGoodsResponse.getTotalAmount());*/
         sdkUpdateOrderProductInfoRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
         sdkUpdateOrderProductInfoRequest.setUserName(assortmentCustomerInfoVo.getNickName());
+        sdkUpdateOrderProductInfoRequest.setOperator(assortmentCustomerInfoVo.getNickName());
         //商品信息
         /*List<CreateOrderProductRequest> createOrderProductRequests = new ArrayList<>();
         queryOrderByIdResponse.getData().getProductList().forEach(each->{

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

@@ -184,6 +184,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
             clearTableRequest.setTableNumber(assortmentCustomerInfoVo.getTableNumber());
             clearTableRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
             clearTableRequest.setOpClearTableEnum(ClearTableRequest.OpClearTableEnum.closeOrder);
+            clearTableRequest.setOperator(assortmentCustomerInfoVo.getNickName());
             orderCenterSdkService.clearTableNumber(clearTableRequest);
             throw e;
         }finally {
@@ -240,6 +241,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
             });
         }
         groupCreateOrderRequest.setProducts(orderProductRequests);
+        groupCreateOrderRequest.setOperator(assortmentCustomerInfoVo.getNickName() == null ? "围餐": assortmentCustomerInfoVo.getNickName());
         return orderCenterSdkService.createGroupOrder(groupCreateOrderRequest);
     }
 
@@ -297,8 +299,10 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
                 return ResponseUtil.error(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);
             }
             ShoppingCartGoodsDto shoppingCartGoodsDto = apportionResponse.getResult();
+            AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingCartGoodsDtoByUpdate(shoppingCartGoodsDto, assortmentCustomerInfoVo, orderId,
+                    createReserveOrderVo.getRepastNumber(), assortmentCustomerInfoVo.getNickName());
             //修改订单信息
-            OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(orderAdapter.conventShoppingCartGoodsDtoByUpdate(shoppingCartGoodsDto,assortmentCustomerInfoVo,orderId,createReserveOrderVo.getRepastNumber()));
+            OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(request);
             //根据购物车version调用购物车sdk删除购物车版本缓存信息
             if(ObjectUtils.notEqual(baseOrderResponse.getErrcode(),RESPONSE_SUCCESS_CODE)){
                 return ResponseUtil.error(ResponseResult.ORDER_EDIT_ERROR);
@@ -438,8 +442,9 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         }
         /*OrderBeanRequest orderBeanRequest = orderAdapter.conventOrderBeanRequest(queryOrderByIdResponse.getData());
         ShoppingCartGoodsResponse shoppingCartGoodsDto = calculationDiscountService.getActivityCalculationDiscount(orderBeanRequest);*/
+        AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingPromotionInfo(null, queryOrderByIdResponse, assortmentCustomerInfoVo);
         //修改订单信息  --围餐不涉及促销，本次调用促销计算只是为了修改订单金额信息
-        OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(orderAdapter.conventShoppingPromotionInfo(null,queryOrderByIdResponse,assortmentCustomerInfoVo));
+        OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(request);
         if(baseOrderResponse == null || ObjectUtils.notEqual(baseOrderResponse.getErrcode(),RESPONSE_SUCCESS_CODE)){
             return ResponseUtil.error(ResponseResult.PREVIEWORDER_UPDATE_ORDERPRICE_ERROR);
         }
@@ -583,6 +588,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
                 clearTableRequest.setTableNumber(assortmentCustomerInfoVo.getTableNumber());
                 clearTableRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
                 clearTableRequest.setOpClearTableEnum(ClearTableRequest.OpClearTableEnum.closeOrder);
+                clearTableRequest.setOperator(assortmentCustomerInfoVo.getNickName());
                 orderCenterSdkService.clearTableNumber(clearTableRequest);
             }
             queryTableStatusReponseVo.setTableNumberStatus(false);

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

@@ -252,6 +252,7 @@ public class OrderCommonService {
         clearTableRequest.setTableNumber(orderBean.getBarCounter());
         clearTableRequest.setUserId(extInfo == null ? "" : extInfo.getPrePayUserId());
         clearTableRequest.setOpClearTableEnum(ClearTableRequest.OpClearTableEnum.noOperationOrder);
+        clearTableRequest.setOperator(orderBean.getUserName());
         orderCenterSdkService.clearTableNumber(clearTableRequest);
         //调用清除购物车接口
         NewShoppingCartClearDto shoppingCartClearDto = new NewShoppingCartClearDto();
@@ -279,6 +280,7 @@ public class OrderCommonService {
             affirmRequest.setMobile(extInfo.getPhone());
             affirmRequest.setExtInfo(JSON.toJSONString(extInfo));
         }
+        affirmRequest.setOperator(orderBean.getUserName());
         AssortmentAffirmGroupOrderResponse groupOrderResponse = orderCenterSdkService.affirmGroupOrder(affirmRequest);
         if(ObjectUtils.notEqual(RESPONSE_SUCCESS_CODE,groupOrderResponse.getErrcode())){
             LogUtil.error("paySuccessCallback_payAccess_faild", JSON.toJSONString(message), JSON.toJSONString(groupOrderResponse));

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

@@ -1866,7 +1866,7 @@ public class OrderServiceImpl implements Orderservice {
     public OrderPayResponse svcPay(String cardCode, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo) {
         CodePayRequest request = new CodePayRequest();
         String partnerId = orderBean.getCompanyId();
-        request.setBody("svc储值卡支付");
+        request.setBody(orderBean.getShopName());
         request.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         request.setCode(cardCode);
         request.setPartnerId(partnerId);