联合丽格1.0.2

src/main/java/com/caimei365/order/components/OrderCommonService.java

@@ -433,9 +433,13 @@ public class OrderCommonService {
         if (null == shopOrderVo.getRealPay()) {
             shopOrderVo.setRealPay(shopOrderVo.getNeedPayAmount());
         }
+        AtomicDouble receipt = new AtomicDouble(0);
+        if (MathUtil.compare(shopOrderVo.getAccountAmount(), 0) > 0 && shopOrderVo.getStatus() != 0) {
+            receipt.set(MathUtil.add(receipt.get(), shopOrderVo.getAccountAmount()).doubleValue());
+        }
         // 支付总金额 = 用户结算金额 + 付款金额
         if(!discernReceiptList.isEmpty()) {
-            shopOrderVo.setReceiptAmount(MathUtil.add(shopOrderVo.getReceiptAmount(), receiptAmount).doubleValue());
+            shopOrderVo.setReceiptAmount(MathUtil.add(receipt.get(), receiptAmount).doubleValue());
         }
         // 待付金额
         shopOrderVo.setObligation(MathUtil.sub(shopOrderVo.getRealPay(), shopOrderVo.getReceiptAmount()).doubleValue());

src/main/java/com/caimei365/order/controller/HeliPayApi.java

@@ -133,13 +133,24 @@ public class HeliPayApi {
     }
 
     @ApiOperation("获取子订单信息")
-    @ApiImplicitParam(required = true, name = "orderId", value = "订单Id")
+    @ApiImplicitParams({
+            @ApiImplicitParam(required = true, name = "orderId", value = "订单Id"),
+            @ApiImplicitParam(required = true, name = "shopOrderId", value = "子订单Id")
+    })
+
     @GetMapping("/shoporders")
-    public ResponseJson<List<ShopOrderVo>> getShopOrders(Integer orderId) {
+    public ResponseJson<List<ShopOrderVo>> getShopOrders(Integer orderId, Integer shopOrderId) {
         if (null == orderId) {
-            return ResponseJson.error("订单Id不能为空！", null);
+            if (null == shopOrderId) {
+                return ResponseJson.error("子订单Id不能为空！", null);
+            }
+        }
+        if (null == shopOrderId) {
+            if (null == orderId) {
+                return ResponseJson.error("订单Id不能为空！", null);
+            }
         }
-        return heliPayService.getShopOrders(orderId);
+        return heliPayService.getShopOrders(orderId, shopOrderId);
     }
 
     /**

src/main/java/com/caimei365/order/service/HeliPayService.java

@@ -54,7 +54,7 @@ public interface HeliPayService {
      */
     String unionCallback(UnionResVo res) throws IntrospectionException, InvocationTargetException, IllegalAccessException;
 
-    ResponseJson<List<ShopOrderVo>> getShopOrders(Integer orderId);
+    ResponseJson<List<ShopOrderVo>> getShopOrders(Integer orderId, Integer shopOrderId);
 
     ResponseJson<JSONObject> getUnionResult(String mbOrderId, Integer orderFlag, Integer shopOrderId);
 

src/main/java/com/caimei365/order/service/impl/HeliPayServiceImpl.java

@@ -1182,14 +1182,23 @@ public class HeliPayServiceImpl implements HeliPayService {
     }
 
     @Override
-    public ResponseJson<List<ShopOrderVo>> getShopOrders(Integer orderId) {
-        String shopOrderId = baseMapper.findShopOrderIds(orderId);
-        // 子订单
-        if (StringUtils.isBlank(shopOrderId)) {
-            return ResponseJson.error("子订单为空！", null);
-        }
-        String[] shopOrderIdArr = shopOrderId.split(",");
-        List<String> shopOrderIds = Arrays.asList(shopOrderIdArr);
+    public ResponseJson<List<ShopOrderVo>> getShopOrders(Integer orderId, Integer shopOrderId) {
+        String[] shopOrderIdArr;
+        List<String> shopOrderIds = new ArrayList<>();
+        if (null != orderId) {
+            String getShopOrderId = baseMapper.findShopOrderIds(orderId);
+            // 子订单
+            if (StringUtils.isBlank(getShopOrderId)) {
+                return ResponseJson.error("子订单为空！", null);
+            }
+             shopOrderIdArr = getShopOrderId.split(",");
+             shopOrderIds = Arrays.asList(shopOrderIdArr);
+        } else {
+            if (null == shopOrderId) {
+                return ResponseJson.error("子订单为空！", null);
+            }
+            shopOrderIds.add(shopOrderId.toString());
+        }
         List<ShopOrderVo> shopOrderList = orderCommonMapper.getPayShopOrderList(shopOrderIds);
         shopOrderList.forEach(shopOrder -> {
             // 店铺促销活动

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -589,10 +589,10 @@ public class OrderClubServiceImpl implements OrderClubService {
         Date date = new Date();
         String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
         String note = "【取消订单】";
-        // 余额退回原账户canRefundAmount
-        if (null != shopOrder.getCanRefundAmount() && MathUtil.compare(shopOrder.getCanRefundAmount(), 0) > 0) {
+        // 余额退回原账户
+        if (null != shopOrder.getAccountAmount() && MathUtil.compare(shopOrder.getAccountAmount(), 0) > 0) {
             double ableUserMoney = baseMapper.getAbleUserMoney(shopOrder.getUserId());
-            double updateMoney = MathUtil.add(ableUserMoney, shopOrder.getCanRefundAmount()).doubleValue();
+            double updateMoney = MathUtil.add(ableUserMoney, shopOrder.getAccountAmount()).doubleValue();
             // 退回用户可用余额
             orderClubMapper.updateAbleUserMoneyByUserId(updateMoney, shopOrder.getUserId());
             log.info(note + ">>>>>>>>>>>可用余额退回原账户(update[user(ableUserMoney)])userId：" + shopOrder.getUserId() + "，shopOrderId：" + shopOrderId);

src/main/java/com/caimei365/order/service/impl/OrderRefundServiceImpl.java

@@ -61,6 +61,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
         CmReturnedPurchase cmReturnedPurchase = new CmReturnedPurchase();
         String returnNo = "T" + System.currentTimeMillis() + new Random().nextInt(1000);
         String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        cmReturnedPurchase.setReturnedWay(1);
         cmReturnedPurchase.setReturnedNo(returnNo);
         cmReturnedPurchase.setShopOrderId(shopOrderId);
         cmReturnedPurchase.setUserId(order.getUserId());

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -753,12 +753,8 @@ public class SubmitServiceImpl implements SubmitService {
                     }
                     // 商品税后价格
                     Double productTaxPrice = MathUtil.add(productPrice, productTax).doubleValue();
-                    log.info("productTaxPrice==="+productTaxPrice);
                     // 折后税后单价
-                    log.info("discountPrice==="+discountPrice);
-                    log.info("discountTax==="+discountTax);
                     Double discountTaxPrice = MathUtil.add(discountPrice, discountTax).doubleValue();
-                    log.info("discountTaxPrice===="+discountTaxPrice);
                     // 折扣率 = 折后单价/机构价
                     Double discountRate = MathUtil.mul(MathUtil.div(discountTaxPrice, productTaxPrice), 100).doubleValue();
                     // 单个商品的金额
@@ -851,7 +847,6 @@ public class SubmitServiceImpl implements SubmitService {
                 // 成本价
                 Double costPrice = null;
 
-                log.info("product.getDiscountPrice()===="+product.getDiscountPrice());
                 /**
                  * 判断是否选中固定成本价
                  * 版本不在使用税费，成本取消再加 机构税费

src/main/resources/mapper/OrderCommonMapper.xml

@@ -63,7 +63,6 @@
         FROM cm_shop_order cso
         LEFT JOIN shop s ON cso.shopID = s.shopID
         WHERE cso.delFlag = 0
-        AND cso.receiptStatus != 3
         AND cso.shopOrderID IN
         <foreach collection="shopOrderIds" open="(" separator="," close=")" item="shopOrderId">
             #{shopOrderId}