删除订单bugfix

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

@@ -234,7 +234,7 @@ public class ProductService {
      */
     public void savePurchasePrice(OrderPo order, OrderProductPo orderProduct, boolean secondFlag, String note) {
         // 非二手订单, 非活动商品，非阶梯价商品，非运费商品，非赠品 才可以写入复购价
-        boolean purchaseFlag = ((!secondFlag) && orderProduct.getActProduct() == 0 && orderProduct.getShopId() != 998 && orderProduct.getPrice() > 0);
+        boolean purchaseFlag = ((!secondFlag) && Integer.valueOf(0).equals(orderProduct.getActProduct()) && orderProduct.getShopId() != 998 && orderProduct.getPrice() > 0);
         boolean historyFlag = false;
         // 不是二手订单才可以写入价格库
         if (purchaseFlag) {

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

@@ -64,7 +64,7 @@ public interface OrderClubMapper {
     /**
      * 逻辑删除主订单
      */
-    void deleteMainOrder(OrderPo order);
+    void deleteMainOrder(Integer orderId, String note);
     /**
      * 逻辑删除子订单
      * @param shopOrderIds 子订单Ids

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

@@ -382,9 +382,8 @@ public class OrderClubServiceImpl implements OrderClubService {
             return ResponseJson.error("订单异常！", null);
         }
         // 逻辑删除主订单
-        order.setDelFlag(1);
         order.setNote("用户发起删除订单");
-        orderClubMapper.deleteMainOrder(order);
+        orderClubMapper.deleteMainOrder(order.getOrderId(), order.getNote());
         log.info("【删除订单】>>>>>>>>>逻辑删除主订单(update[cm_order])orderId：" + orderId);
         // 逻辑删除子订单
         String[] shopOrderIdArr = order.getShopOrderIds().split(",");

src/main/resources/mapper/OrderClubMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.caimei365.order.mapper.OrderClubMapper">
     <update id="updateSecondStatus">
         UPDATE cm_second_hand_detail SET sold = #{sold}
-        WHERE productID = #{productID} AND secondHandType=1
+        WHERE productID = #{productId} AND secondHandType=1
     </update>
     <update id="updateUserMoneyByUserId">
         UPDATE USER SET userMoney = #{userMoney}
@@ -48,9 +48,7 @@
         WHERE orderID = #{orderId}
     </update>
     <update id="deleteMainOrder">
-        UPDATE cm_order SET
-        status = #{status},
-        note = #{note}
+        UPDATE cm_order SET delFlag=1, note=#{note}
         WHERE orderID = #{orderId}
     </update>
     <update id="deleteShopOrder">