Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of…

Merge branches 'feature/20210806_日志问题修复_wuping' 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

@@ -2616,7 +2616,7 @@ public class OrderSdkAdapter {
 
     public BaseOrderResponse convent2NewOrderUpdateThirdOrderCode(BaseResponse updateThirdOrderCode) {
         BaseOrderResponse baseOrderResponse = new BaseOrderResponse();
-        baseOrderResponse.setErrcode(updateThirdOrderCode.getCode() != null ? Integer.parseInt(updateThirdOrderCode.getCode()) : 500);
+        baseOrderResponse.setErrcode(updateThirdOrderCode.getCode() != null ? Integer.parseInt(updateThirdOrderCode.getCode()) : 501);
         baseOrderResponse.setErrmsg(updateThirdOrderCode.getMessage());
         return baseOrderResponse;
 
@@ -2624,7 +2624,7 @@ public class OrderSdkAdapter {
 
     public BaseOrderResponse convent2UpdatePickUpGoodNo(BaseResponse baseResponse) {
         BaseOrderResponse baseOrderResponse = new BaseOrderResponse();
-        baseOrderResponse.setErrcode(baseResponse.getCode() != null ? Integer.parseInt(baseResponse.getCode()) : 500);
+        baseOrderResponse.setErrcode(baseResponse.getCode() != null ? Integer.parseInt(baseResponse.getCode()) : 501);
         baseOrderResponse.setErrmsg(baseResponse.getMessage());
         return baseOrderResponse;
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -162,7 +162,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         CreateFatherSonOrderResponse createFatherSonOrderResponse = orderSdkAdapter.convent2NEWFatherOrderInfoReqs(baseResponse);
         List<QueryOrdersResponse.DataBean.OrderBean> productOrderInfo = createFatherSonOrderResponse.getOrderBeanList().stream().filter(orderBeanTemp -> 1 == orderBeanTemp.getBizType()).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(productOrderInfo)) {
-            return CreateFatherSonOrderResponse.error("500", "");
+            return CreateFatherSonOrderResponse.error("501", "");
         }
         CreateFatherSonOrderRequest.OrderInfo productOrderRequest = createFatherSonOrderRequest.getOrderInfoList().stream().filter(orderBeanTemp -> 1 == orderBeanTemp.getBizType()).collect(Collectors.toList()).get(0);
         BaseOrderResponse baseOrderResponse =updateStockAndScore(productOrderInfo.get(0), productOrderRequest.getProducts(), productOrderRequest.getActivityUpdateStockRequest(), productOrderRequest.getAccounts(),
@@ -1307,7 +1307,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             dataBean.setOrders(orderBeanList);
         }
         response.setData(dataBean);
-        response.setErrcode(baseResponse.getCode() != null ? Integer.parseInt(baseResponse.getCode()) : 500);
+        response.setErrcode(baseResponse.getCode() != null ? Integer.parseInt(baseResponse.getCode()) : 501);
         response.setErrmsg(baseResponse.getMessage());
         return response;
     }

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

@@ -3899,7 +3899,7 @@ public class OrderAdapter {
      */
     public String newSendPayFailedMessage() {
         Map<String, Object> map = Maps.newTreeMap();
-        map.put("code", 500);
+        map.put("code", 102);
         map.put("message", "failed");
         return gson.toJson(map);
     }

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

@@ -303,7 +303,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 //  新版支付成功的情况下code为100
                 return newSendPaySuccessNoticeMessage();
             } else {
-                return newSendPayFaileMessage();
+                return res;
             }
         }
         return newSendPayFaileMessage();
@@ -366,7 +366,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
      */
     public String newSendPayFaileMessage() {
         Map<String, Object> map = Maps.newTreeMap();
-        map.put("code", 500);
+        map.put("code", 102);
         map.put("message", "failed");
         return gson.toJson(map);
     }
@@ -1834,7 +1834,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
      */
     public String refundFailedMessage(String errorMes) {
         Map<String, Object> map = Maps.newTreeMap();
-        map.put("code", 500);
+        map.put("code", 102);
         map.put("message", "failed:" + errorMes);
         return gson.toJson(map);
     }

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

@@ -989,7 +989,7 @@ public class MallOrderServiceImpl implements MallOrderService {
      */
     public String refundFaileMessage(String errorMes) {
         Map<String, Object> map = Maps.newTreeMap();
-        map.put("code", 500);
+        map.put("code", 102);
         map.put("message", "failed:" + errorMes);
         return gson.toJson(map);
     }

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

@@ -209,7 +209,7 @@ public class OrderCommonService {
      */
     public String newSendPayFaileMessage() {
         Map<String, Object> map = Maps.newTreeMap();
-        map.put("code", 500);
+        map.put("code", 102);
         map.put("message", "failed");
         return JSON.toJSONString(map);
     }

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

@@ -2285,7 +2285,7 @@ public class OrderServiceImpl implements Orderservice {
      */
     public String refundFaileMessage(String errorMes) {
         Map<String, Object> map = Maps.newTreeMap();
-        map.put("code", 500);
+        map.put("code", 102);
         map.put("message", "failed:" + errorMes);
         return gson.toJson(map);
     }

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

@@ -894,7 +894,7 @@ public class ShoppingCartConvertAdapter {
                 for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods productMaterial :comboxGoods.getProductMaterialList()) {
                     for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType detailType : materialList) {
 //                        productMaterial.setCustomerCode(StringUtils.isNotEmpty(detailType.getCustomerCode()) ? detailType.getCustomerCode() : "");
-                        if (detailType.getProductId().equals(productMaterial.getSpuId())) {
+                        if (Objects.equals(detailType.getProductId(),productMaterial.getSpuId())) {
                             productMaterial.setAmount(null != detailType.getMarkUpPrice() ? detailType.getMarkUpPrice().longValue() : 0);
                             productMaterial.setFinalPrice(null != detailType.getProductFinalPrice() ? detailType.getProductFinalPrice().longValue() : 0);
                             productMaterial.setSpuName(StringUtils.isNotEmpty(detailType.getProductName()) ? detailType.getProductName() : "");
@@ -912,7 +912,6 @@ public class ShoppingCartConvertAdapter {
         }
     }
 
-
     private Map<String, String> getAttributesNew(List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.CartGoodsExtra> extra) {
         if (CollectionUtils.isEmpty(extra)) {
             return new HashMap<>();

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -163,7 +163,6 @@ public class CalculationServiceImpl {
 //        try {
             activityCalculationDiscountResponseDto = activityClient.calculationDiscountSharing(discountRequest);
 //        } catch (Exception ex) {
-//            ErrorLog.errorDev("500", "/calculation/discount/sharing_error", ex, discountRequest);
 //            throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
 //        }
         //优惠券互斥