Merge remote-tracking branch 'origin/developer' into developerH

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

@@ -718,7 +718,7 @@ public class SubmitServiceImpl implements SubmitService {
                     if (taxFlag) {
                         discountTax = MathUtil.div(MathUtil.mul(product.getDiscountPrice(), product.getTaxRate()), 100, 2).doubleValue();
                     }
-                    costPrice = MathUtil.div(MathUtil.mul(MathUtil.add(product.getDiscountPrice(), discountTax), product.getCostProportional()), 100).doubleValue();
+                    costPrice = MathUtil.div(MathUtil.mul(MathUtil.add(product.getDiscountPrice(), discountTax), product.getCostProportional()), 100, 2).doubleValue();
                 }
                 if (null == costPrice) {
                     return ResponseJson.error("订单商品成本异常！", null);

src/main/resources/mapper/ReceiptMapper.xml

@@ -380,7 +380,7 @@
                         cdr.cancelReason,
                         cdr.confirmType,
                         cdr.reviewReason,
-                        cdr.newReceiptType,
+                        IFNULL(cdr.newReceiptType,2) AS newReceiptType,
                         cdr.shopName,
                         receiptUserPermissionID AS receiptUserPermissionId,
                         confirmUserPermissionID AS confirmUserPermissionId,
@@ -1084,7 +1084,7 @@
                      </if>
                      AND cms.payStatus=3
                      AND cmo.receiptStatus = 3
-                     AND cmo.confirmTime >= '2022-05-01 00:00:00'
+                     AND cmo.confirmTime >= '2022-01-01 00:00:00'
                      AND cmo.rebateFlag != 1
                      AND cms.shopId != 998
                      AND csp.newReceiptType is null