zhijiezhao 3 vuotta sitten
vanhempi
commit
7675c7ecc5

+ 4 - 0
src/main/java/com/caimei365/order/model/vo/OrderVo.java

@@ -14,6 +14,10 @@ import java.util.List;
 @Data
 public class OrderVo implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * orderSeen:订单对机构可见度,1可见,2不可见
+     */
+    private Integer orderSeen;
     /**
      * 订单号
      */

+ 1 - 1
src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1380,7 +1380,7 @@ public class SubmitServiceImpl implements SubmitService {
                     if (mainOrderIds != null && mainOrderIds.size() > 2) {
                         //设置手动回滚事务
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return ResponseJson.error(-3, "您已有2个采购金额过小的订单,本次不能再进行采购。建议您前往采美旗下“呵呵商城”小程序购买小额商品");
+                        return ResponseJson.error(-3, "您已有2个采购金额过小的订单,本次不能再进行采购。您可使用微信扫描以下二维码,进入采美旗下“呵呵商城”小程序购买小额商品");
                     }
                     UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
                     beansHistory.setUserId(mainOrder.getUserId());

+ 1 - 0
src/main/resources/mapper/OrderClubMapper.xml

@@ -124,6 +124,7 @@
     </select>
     <select id="getMainOrderByOrderId" resultType="com.caimei365.order.model.po.OrderPo">
         SELECT
+            orderSeen,
             orderID AS orderId,
             shopOrderIds,
             orderSource,