no message

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

@@ -7,6 +7,7 @@ import com.gree.mall.miniapp.bean.material.*;
 import com.gree.mall.miniapp.bean.material.parts.*;
 import com.gree.mall.miniapp.bean.material.stock.WorkerNormStockBean;
 import com.gree.mall.miniapp.plus.entity.AdminWebsit;
+import com.gree.mall.miniapp.plus.entity.User;
 import com.gree.mall.miniapp.plus.entity.WebsitPartsSalesItem;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,7 +22,7 @@ public interface MaterialMapper {
      * 购买记录
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<SalesOrderBean> buyList(IPage page, @Param("companyWechatId") String companyWechatId, @Param("userId") String userId, @Param("flag") String flag);
+    IPage<SalesOrderBean> buyList(IPage page, @Param("companyWechatId") String companyWechatId, @Param("user") User user, @Param("flag") String flag);
 
     /**
      * 网点库存分类

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/WebsitSalesLogic.java

@@ -83,7 +83,7 @@ public class WebsitSalesLogic {
 
     public IPage<SalesOrderBean> buyList(String flag, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
-        IPage<SalesOrderBean> page = materialMapper.buyList(new Page<>(pageNum, pageSize), wechat.getCurrentCompanyWechatId(), wechat.getUser().getWorkerNumber(), flag);
+        IPage<SalesOrderBean> page = materialMapper.buyList(new Page<>(pageNum, pageSize), wechat.getCurrentCompanyWechatId(), wechat.getUser(), flag);
         return page;
     }
 
@@ -123,36 +123,36 @@ public class WebsitSalesLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
         websitSalesService.lambdaUpdate()
                 .set(WebsitSales::getFlag, "CANCEL")
-                .eq(WebsitSales::getWorkerId, currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(WebsitSales::getIdentity, currentCompanyWechat.getUser().getIdCard())
                 .eq(WebsitSales::getSalesId, salesId)
                 .in(WebsitSales::getFlag, "SAVE", "SUBMIT")
                 .update();
     }
 
-    public PayDetail pay(HttpServletRequest request, String salesId,Boolean miniPay,String openId) {
+    public PayDetail pay(HttpServletRequest request, String salesId, Boolean miniPay, String openId) {
         String ip = IpUtil.getIpAddr(request);
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
         WebsitSales sales = websitSalesService.lambdaQuery()
                 .eq(WebsitSales::getSalesId, salesId)
-                .eq(WebsitSales::getWorkerId, wechat.getUser().getWorkerNumber())
+                .eq(WebsitSales::getIdentity, wechat.getUser().getIdCard())
                 .eq(WebsitSales::getFlag, "SUBMIT")
                 .one();
         if (Objects.isNull(sales)) {
             throw new RemoteServiceException(salesId + "订单号不存在，无法发起支付");
         }
 
-        if ( miniPay != null && miniPay) {
+        if (miniPay != null && miniPay) {
             websitSalesService.lambdaUpdate()
                     .eq(WebsitSales::getSalesId, salesId)
                     .set(WebsitSales::getSource, OrderInfoSourceEnum.A.getRemark())
                     .update();
-        }else {
+        } else {
             websitSalesService.lambdaUpdate()
                     .eq(WebsitSales::getSalesId, salesId)
                     .set(WebsitSales::getSource, OrderInfoSourceEnum.B.getRemark())
                     .update();
         }
-        return wechatLogic.payment(salesId, sales.getTotalAmount(),miniPay != null && miniPay?openId:wechat.getUser().getOpenId(), "N", ip, sales.getCompanyWechatId(),miniPay);
+        return wechatLogic.payment(salesId, sales.getTotalAmount(), miniPay != null && miniPay ? openId : wechat.getUser().getOpenId(), "N", ip, sales.getCompanyWechatId(), miniPay);
     }
 
     public List<WebsitSalesCategoryVO> existStockCategory(HttpServletRequest request, String websitId) {

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

@@ -193,7 +193,7 @@
             websit_sales a
         <where>
             a.company_wechat_id = #{companyWechatId}
-            AND worker_id = #{userId}
+            AND a.identity = #{user.idCard}
             <if test="flag!=null and flag!=''">
                 AND a.flag = #{flag}
             </if>