no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/MaterialMapper.java

@@ -100,10 +100,10 @@ public interface MaterialMapper {
     /**
      * 收费标准师傅库存
      * @param goodsId
-     * @param workerId
+     * @param identity
      * @return
      */
-    List<WorkerNormStockBean> queryWorkerStockQty(@Param("goodsId") String goodsId, @Param("workerId") String workerId);
+    List<WorkerNormStockBean> queryWorkerStockQty(@Param("goodsId") String goodsId, @Param("identity") String identity);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<NewRefundManageBean> appList(IPage page,

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -385,10 +385,10 @@ public class PayOrderLogic {
                     WorkerNormStockBean stock = workerStockMap.get(stockBean.getWorkerGoodsId());
                     stock.setRealQty(stock.getRealQty().add(useTotalQty));
 
-                    if (!stockBean.getIsSmall() && stock.getRealQty().compareTo(stockBean.getStockQty()) > 0) {
-                        throw new RemoteServiceException("收费标准关联的 " + stockBean.getGoodsName() + "库存数量"
-                                + stock.getStockQty() + ", 需扣" + stock.getRealQty() + ", 库存数量不够扣减");
-                    }
+//                    if (!stockBean.getIsSmall() && stock.getRealQty().compareTo(stockBean.getStockQty()) > 0) {
+//                        throw new RemoteServiceException("收费标准关联的 " + stockBean.getGoodsName() + "库存数量"
+//                                + stock.getStockQty() + ", 需扣" + stock.getRealQty() + ", 库存数量不够扣减");
+//                    }
                 }
             }
         }
@@ -632,7 +632,7 @@ public class PayOrderLogic {
             WebsitNormCharge websitNormCharge = websitNormChargeService.getById(item.getGoodsId());
             if (websitNormCharge.getNormType().equals(NormTypeEnum.M.getKey())) {
                 // 获取当前关联师傅库存记录
-                List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(item.getGoodsId(), workerOrder.getWorkerId());
+                List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(item.getGoodsId(), workerOrder.getIdentity());
                 if (CollectionUtil.isNotEmpty(stockBeanList)) {
                     BigDecimal totalNum = item.getNum();
                     for (WorkerNormStockBean stockBean : stockBeanList) {

mall-miniapp-service/src/main/resources/mapper/MaterialMapper.xml

@@ -354,7 +354,7 @@
             ON a.company_wechat_id = b.company_wechat_id AND a.worker_goods_id = b.goods_id
                 LEFT JOIN
             worker_stock c
-            ON c.worker_id = #{workerId} AND a.company_wechat_id = c.company_wechat_id AND a.worker_goods_id = c.goods_id
+            ON c.identity = #{identity} AND a.company_wechat_id = c.company_wechat_id AND a.worker_goods_id = c.goods_id
         WHERE
             a.norm_id = #{goodsId}
     </select>