huanglizhi 11 달 전
부모
커밋
3cf943fd4e

+ 1 - 0
module-erp/src/main/java/com/hys/app/controller/erp/use/CompanyController.java

@@ -138,4 +138,5 @@ public class CompanyController {
             throw new ServiceException("未识别到营业执照相关内容,请重新上传");
         }
     }
+
 }

+ 10 - 10
module-erp/src/main/java/com/hys/app/controller/erp/use/PayController.java

@@ -188,16 +188,16 @@ public class PayController extends HttpServlet {
 
     @PostMapping("/wxpay/notify")
     public String parseOrderNotify(@RequestBody String xmlData) {
-//        try {
-//            System.out.println("微信支付回调来了啊+11111111111111111111111111111111111111111111111111111111111");
-//            WxPayServiceImpl wxPayService = new WxPayServiceImpl();
-//            // 解析支付通知结果
-//            WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
-//            // 处理订单逻辑
-//        } catch (WxPayException e) {
-//            // 处理解析异常,记录日志
-//            e.printStackTrace();
-//        }
+        try {
+            System.out.println("微信支付回调来了啊+11111111111111111111111111111111111111111111111111111111111");
+            WxPayServiceImpl wxPayService = new WxPayServiceImpl();
+            // 解析支付通知结果
+            WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
+            // 处理订单逻辑
+        } catch (WxPayException e) {
+            // 处理解析异常,记录日志
+            e.printStackTrace();
+        }
 //        return "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[解析失败]]></return_msg></xml>";
         return "<xml>" +
                 "<return_code><![CDATA[" + "SUCCESS" + "]]></return_code>" +

+ 12 - 0
module-erp/src/main/java/com/hys/app/model/erp/entity/CompanyDO.java

@@ -120,4 +120,16 @@ public class CompanyDO {
     @NotNull(message = "验证码不能为空")
     private String checkCode;
 
+    //商家的收款信息
+    private String aliAppId;
+
+    private String aliAppPrivateKey;
+
+    private  String aliAlipayPublicKey;
+
+    private  String wxSubMchId;
+
+
+
+
 }

+ 11 - 0
module-erp/src/main/java/com/hys/app/model/erp/entity/CompanyErp.java

@@ -166,4 +166,15 @@ public class CompanyErp extends BaseDO {
     private  String idCardNum;
 
     private String idCardTime;
+
+    //商家的收款信息
+    //appid
+    private String aliAppId;
+
+    // 阿里私钥
+    private String aliAppPrivateKey;
+    // 阿里公钥
+    private  String aliAlipayPublicKey;
+    // 微信店铺id
+    private  String wxSubMchId;
 }

+ 17 - 20
module-erp/src/main/java/com/hys/app/service/erp/impl/ProductManagerImpl.java

@@ -35,16 +35,18 @@ import java.util.*;
 public class ProductManagerImpl extends BaseServiceImpl<ProductMapper, ProductDO> implements ProductManager {
 
     private ProductStockManager productStockManager;
+
     @Override
     public IPage<ProductDO> list(ProductQueryParams queryParams) {
-       return page(new Page<>(queryParams.getPageNo(), queryParams.getPageSize()), new LambdaQueryWrapper<ProductDO>()
-                .and(StrUtil.isNotBlank(queryParams.getKeyword()), item -> item.like(ProductDO::getName, queryParams.getName())
-                        .or()
-                        .like(ProductDO::getSku, queryParams.getKeyword())
-                        .or()
-                        .like(ProductDO::getBrand, queryParams.getKeyword())
-                        .or()
-                        .like(ProductDO::getBarCode, queryParams.getKeyword())));
+        return page(new Page<>(queryParams.getPageNo(), queryParams.getPageSize()), new LambdaQueryWrapper<ProductDO>()
+                .and(StrUtil.isNotBlank(queryParams.getKeyword()),
+                        item -> item.like(ProductDO::getName, queryParams.getKeyword())
+                                .or()
+                                .like(ProductDO::getSku, queryParams.getKeyword())
+                                .or()
+                                .like(ProductDO::getBrand, queryParams.getKeyword())
+                                .or()
+                                .like(ProductDO::getBarCode, queryParams.getKeyword())));
 
     }
 
@@ -58,18 +60,13 @@ public class ProductManagerImpl extends BaseServiceImpl<ProductMapper, ProductDO
     }
 
 
-
-
-
-
-
     @Override
     public void updateWarnStock(List<Long> stockId, Integer warnNum) {
-        if (warnNum<0){
+        if (warnNum < 0) {
             throw new ServiceException("预警库存不能小于0");
         }
-        List<ProductStockDO> list = productStockManager.list(new LambdaQueryWrapper<ProductStockDO>().in(ProductStockDO::getId,stockId));
-        list.forEach(item ->item.setWarningStock(warnNum));
+        List<ProductStockDO> list = productStockManager.list(new LambdaQueryWrapper<ProductStockDO>().in(ProductStockDO::getId, stockId));
+        list.forEach(item -> item.setWarningStock(warnNum));
         productStockManager.updateBatchById(list);
     }
 
@@ -102,21 +99,21 @@ public class ProductManagerImpl extends BaseServiceImpl<ProductMapper, ProductDO
             throw new ServiceException("删除失败,该商品在仓库里面还有库存");
         }
         //删除库存
-        productStockManager.remove(new LambdaQueryWrapper<ProductStockDO>().eq(ProductStockDO::getProductId,id));
+        productStockManager.remove(new LambdaQueryWrapper<ProductStockDO>().eq(ProductStockDO::getProductId, id));
         removeById(id);
     }
 
-    private void checkParam(ProductDO productDO){
+    private void checkParam(ProductDO productDO) {
         ProductDO oneName = getOne(new LambdaQueryWrapper<ProductDO>()
                 .eq(ProductDO::getName, productDO.getName())
                 .ne(ObjectUtil.isNotNull(productDO.getId()), ProductDO::getId, productDO.getId()));
-        if (ObjectUtil.isNotNull(oneName)){
+        if (ObjectUtil.isNotNull(oneName)) {
             throw new ServiceException("商品名称重复");
         }
         ProductDO oneSn = getOne(new LambdaQueryWrapper<ProductDO>()
                 .eq(ProductDO::getSnCode, productDO.getSnCode())
                 .ne(ObjectUtil.isNotNull(productDO.getId()), ProductDO::getId, productDO.getId()));
-        if (ObjectUtil.isNotNull(oneSn)){
+        if (ObjectUtil.isNotNull(oneSn)) {
             throw new ServiceException("商品sn码重复");
         }
     }