Merge remote-tracking branch 'origin/qa' into qa

call-back-service/src/main/java/cn/freemud/controller/CallBackController.java

@@ -17,6 +17,7 @@ import cn.freemud.entities.vo.OrderCallBackRequestVo;
 import cn.freemud.service.OrderCallBackService;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
+import lombok.extern.log4j.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +29,7 @@ import javax.validation.Valid;
 
 @RestController
 @RequestMapping(value = "/callback", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Log4j
 public class CallBackController {
 
     @Autowired
@@ -36,6 +38,8 @@ public class CallBackController {
     @PostMapping("/order")
     @ApiAnnotation(logMessage = "/order")
     public BaseResponse orderCallBackHandle(@Valid @RequestBody @LogParams OrderCallBackRequestVo requestVo) {
+        log.info("in callback order ordercode:"+ requestVo.getOrderCode());
+        log.info("callback order requestVo:"+ requestVo);
         return orderCallBackService.orderCallBackHandle(requestVo);
     }
 

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

@@ -2382,11 +2382,14 @@ public class OrderAdapter {
         if(cartGoodsDetailDto.getProductType() != null) {
             if(cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode()
                     || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode()) {
-                createOrderProductDemoDto.setPrice(0l);
+//                createOrderProductDemoDto.setPrice(0l);
                 //套餐
                 List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
                 cartGoodsDetailDto.getComboProducts().forEach(product -> {
                     CreateOrderProductRequest createOrderComboProduct = convent2MCCafeOrderProductDemo(product, product.getProductType());
+                    if(!product.getIsFixedProduct()) {
+                        createOrderProductDemoDto.setPrice(createOrderProductDemoDto.getPrice()+product.getOriginalPrice());
+                    }
                     comboProducts.add(createOrderComboProduct);
                     if(CollectionUtils.isNotEmpty(product.getMaterialList())) {
                         //加料商品

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

@@ -842,6 +842,22 @@ public class ShoppingCartMCoffeeServiceImpl {
         //设置均摊信息
         calculationService.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscount, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo);
 
+        //如果是餐具商品，则放到最后
+        if (CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getProducts())) {
+            int size = shoppingCartGoodsDto.getProducts().size();
+            for(int i=0;i<size;i++) {
+                if(shoppingCartGoodsDto.getProducts().get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
+                    ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = shoppingCartGoodsDto.getProducts().get(i);
+                    cartGoodsDetailDto.setIsTableware(1);
+                    if(i != size-1) {
+                        shoppingCartGoodsDto.getProducts().remove(i);
+                        shoppingCartGoodsDto.getProducts().add(cartGoodsDetailDto);
+                        break;
+                    }
+                }
+            }
+        }
+
         return ResponseUtil.success(shoppingCartGoodsDto);
     }