查看订单信息

backup.sql

@@ -48,4 +48,4 @@ MODIFY COLUMN `normalUserID` bigint(11) DEFAULT NULL COMMENT '【V2021已废弃
 
 -- 修改 repeat_purchase_price 复购价格库表
 ALTER TABLE `repeat_purchase_price`
-ADD COLUMN `updateTime` INT(11) DEFAULT NULL COMMENT '更新时间' AFTER `createTime`;
+ADD COLUMN `updateTime` varchar(50) DEFAULT NULL COMMENT '更新时间' AFTER `createTime`;

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

@@ -45,7 +45,7 @@ public class OrderCommonService {
         // 判断二手订单情况下，若部分付款和已付款，排除退货/款的情况，且未确认打款供应商，10,添加确认打款供应商按钮
         if (1 == order.getSecondHandOrderFlag() && 0 == order.getRefundType() && 0 == order.getAffirmPaymentFlag()) {
             if (order.getStatus().toString().startsWith("2") || order.getStatus().toString().startsWith("3")) {
-                // 之前是 “00”
+                // 之前是 “00”, 现在int 10, 前端显示按钮用
                 order.setAffirmPaymentFlag(10);
             }
         }
@@ -185,8 +185,4 @@ public class OrderCommonService {
             orderCommonMapper.deleteSearchHistoryLimit(userId);
         }
     }
-
-
-
-
 }

src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -135,4 +135,8 @@ public interface OrderCommonMapper {
      * 活动券商品Ids
      */
     List<Integer> getCouponProductIds(Integer couponId, Integer source);
+    /**
+     * 获取订单发票信息
+     */
+    InvoiceVo getOrderInvoice(Integer orderId);
 }

src/main/java/com/caimei365/order/model/vo/OrderProductVo.java

@@ -173,6 +173,10 @@ public class OrderProductVo implements Serializable {
      * 下单时商品购买价格类型快照 0 机构价，1活动价 ，2阶梯价
      */
     private Integer actProduct;
+    /**
+     * 商品类型(0正常商品,1协商赠品,2促销赠品)
+     */
+    private Integer productType;
 //    /**
 //     * 阶梯价列表(临时用，保存订单阶梯价格)
 //     */

src/main/java/com/caimei365/order/model/vo/OrderVo.java

@@ -147,6 +147,10 @@ public class OrderVo implements Serializable {
      * 小计金额 （商品折后单价乘以数量，再加上税费）
      */
     private Double orderTotalFee;
+    /**
+     * 经理折扣
+     */
+    private Double discountFee;
     /**
      * 订单总额（小计金额减去经理折扣后，再加上运费）
      */

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

@@ -172,9 +172,11 @@ public class OrderClubServiceImpl implements OrderClubService {
             });
         });
         order.setExpensesOfTaxation(expensesOfTaxation.get());
-
         // 发票信息
-        InvoiceVo invoice = baseMapper.getUserInvoice(userId);
+        InvoiceVo invoice = null;
+        if (null != order.getInvoiceFlag() || order.getInvoiceFlag() > 0) {
+            invoice = orderCommonMapper.getOrderInvoice(orderId);
+        }
         // 可用余额
         Double availableMoney = baseMapper.getAbleUserMoney(userId);
         // 付款金额

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

@@ -438,7 +438,7 @@ public class SubmitServiceImpl implements SubmitService {
                 // 成本价
                 Double costPrice = null;
                 // 判断是否选中固定成本价
-                if (null != product.getCostPrice() && 1 == product.getCostCheckFlag() && product.getCostPrice() > 0d) {
+                if (null != product.getCostPrice() && 1 == product.getCostCheckFlag() && product.getCostPrice() >= 0d) {
                     costPrice = product.getCostPrice();
                 }
                 // 判断是否选中比例成本价

src/main/resources/mapper/OrderClubMapper.xml

@@ -120,6 +120,7 @@
     <select id="getMainOrderByOrderId" resultType="com.caimei365.order.model.po.OrderPo">
         SELECT
             orderID AS orderId,
+            shopOrderIds,
             orderSource,
             orderNo,
             userID AS userId,
@@ -234,6 +235,7 @@
     <select id="getOrderList" resultType="com.caimei365.order.model.vo.OrderVo">
         SELECT
             orderID AS orderId,
+            shopOrderIds,
             orderSource,
             orderNo,
             userID AS userId,
@@ -266,6 +268,7 @@
             freight AS postage,
             productTotalFee,
             orderTotalFee,
+            discountFee,
             payTotalFee,
             payableAmount,
             balancePayFee,
@@ -306,6 +309,7 @@
     <select id="getOrderListByKeyword" resultType="com.caimei365.order.model.vo.OrderVo">
         SELECT DISTINCT
         co.orderID AS orderId,
+        shopOrderIds,
         co.orderSource,
         co.orderNo,
         co.userID AS userId,

src/main/resources/mapper/OrderCommonMapper.xml

@@ -6,6 +6,7 @@
     </select>
     <select id="getShopOrderList" resultType="com.caimei365.order.model.vo.ShopOrderVo">
         SELECT
+        cso.shopOrderID AS shopOrderId,
         cso.shopOrderNo,
         cso.orderID AS orderId,
         cso.orderNo,
@@ -98,6 +99,7 @@
         cop.buyAgainFlag,
         cop.notOutStore,
         cop.isActProduct AS actProduct,
+        cop.productType,
         p.productCategory as productCategory
         FROM cm_order_product cop
         LEFT JOIN product p ON cop.productID = p.productID
@@ -215,6 +217,7 @@
         cop.buyAgainFlag,
         cop.notOutStore,
         cop.isActProduct AS actProduct,
+        cop.productType,
         p.productCategory as productCategory
         FROM cm_order_product cop
         LEFT JOIN product p ON cop.productID = p.productID
@@ -288,7 +291,7 @@
     </select>
     <select id="getShopOrderListByOrderId" resultType="com.caimei365.order.model.vo.ShopOrderVo">
         SELECT
-        shopOrderId,
+        shopOrderID AS shopOrderId,
         shopOrderNo,
         orderID AS orderId,
         orderNo,
@@ -428,4 +431,18 @@
             AND appletsStatus = 1
         </if>
     </select>
+    <select id="getOrderInvoice" resultType="com.caimei365.order.model.vo.InvoiceVo">
+        SELECT
+            id,
+            orderId,
+            invoiceTitle,
+            corporationTaxNum,
+            registeredAddress,
+            registeredPhone,
+            bankAccountNo,
+            openBank
+        FROM bp_order_invoice
+        WHERE orderId = #{orderId}
+        LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/ShipMapper.xml

@@ -187,7 +187,7 @@
     </select>
     <select id="getShopOrder" resultType="com.caimei365.order.model.vo.ShopOrderVo">
         SELECT
-            shopOrderId,
+            shopOrderID AS shopOrderId,
             shopOrderNo,
             orderID AS orderId,
             orderNo,
@@ -273,6 +273,7 @@
             cop.payStatus,
             cop.buyAgainFlag,
             cop.notOutStore,
+            cop.productType,
             cop.isActProduct AS actProduct
         FROM cm_order_product cop
         WHERE cop.orderProductID = #{orderProductId}