Ver Fonte

no message

FengChaoYu há 9 meses atrás
pai
commit
448f3c6037

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

@@ -80,14 +80,14 @@ 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.getUserId(), flag);
+        IPage<SalesOrderBean> page = materialMapper.buyList(new Page<>(pageNum, pageSize), wechat.getCurrentCompanyWechatId(), wechat.getUser().getWorkerNumber(), flag);
         return page;
     }
 
     public SalesOrderBean detail(HttpServletRequest request, String salesId) {
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
         WebsitSales sales = websitSalesService.lambdaQuery()
-                .eq(WebsitSales::getWorkerId, wechat.getUserId())
+                .eq(WebsitSales::getWorkerId, wechat.getUser().getWorkerNumber())
                 .eq(WebsitSales::getSalesId, salesId)
                 .one();
         if (Objects.isNull(sales)) {
@@ -117,7 +117,7 @@ public class WebsitSalesLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
         websitSalesService.lambdaUpdate()
                 .set(WebsitSales::getFlag, "CANCEL")
-                .eq(WebsitSales::getWorkerId, currentCompanyWechat.getUserId())
+                .eq(WebsitSales::getWorkerId, currentCompanyWechat.getUser().getWorkerNumber())
                 .eq(WebsitSales::getSalesId, salesId)
                 .in(WebsitSales::getFlag, "SAVE", "SUBMIT")
                 .update();
@@ -128,7 +128,7 @@ public class WebsitSalesLogic {
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
         WebsitSales sales = websitSalesService.lambdaQuery()
                 .eq(WebsitSales::getSalesId, salesId)
-                .eq(WebsitSales::getWorkerId, wechat.getUserId())
+                .eq(WebsitSales::getWorkerId, wechat.getUser().getWorkerNumber())
                 .eq(WebsitSales::getFlag, "SUBMIT")
                 .one();
         if (Objects.isNull(sales)) {
@@ -194,19 +194,19 @@ public class WebsitSalesLogic {
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
         MyDataCountBean bean = new MyDataCountBean();
         bean.setWaitPayCount(websitSalesService.lambdaQuery()
-                .eq(WebsitSales::getWorkerId, wechat.getUserId())
+                .eq(WebsitSales::getWorkerId, wechat.getUser().getWorkerNumber())
                 .eq(WebsitSales::getFlag, "SUBMIT")
                 .count());
         bean.setEndPayCount(websitSalesService.lambdaQuery()
-                .eq(WebsitSales::getWorkerId, wechat.getUserId())
+                .eq(WebsitSales::getWorkerId, wechat.getUser().getWorkerNumber())
                 .eq(WebsitSales::getFlag, "PAY_NOT_TAKE")
                 .count());
         bean.setEndCount(websitSalesService.lambdaQuery()
-                .eq(WebsitSales::getWorkerId, wechat.getUserId())
+                .eq(WebsitSales::getWorkerId, wechat.getUser().getWorkerNumber())
                 .eq(WebsitSales::getFlag, "PAY_TAKE")
                 .count());
         bean.setSaveCount(websitSalesService.lambdaQuery()
-                .eq(WebsitSales::getWorkerId, wechat.getUserId())
+                .eq(WebsitSales::getWorkerId, wechat.getUser().getWorkerNumber())
                 .eq(WebsitSales::getFlag, "SAVE")
                 .count());