add

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -829,7 +829,8 @@ public class CompanyServiceImpl implements ICompanyService
         // 1. 获取所有部门数据
         List<CompanyDept> allCompanyDepts = companyDeptMapper.queryDeptDataAll();
 
-        // 2. 按部门ID分组，方便直接获取部门信息
+        // 2. 按部门ID分组，方便直接获取
+        // 2部门信息
         Map<Long, CompanyDept> deptMapById = allCompanyDepts.stream()
                 .filter(e -> e.getDeptId() != null)
                 .collect(Collectors.toMap(CompanyDept::getDeptId, dept -> dept, (a, b) -> a));

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -3749,6 +3749,17 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         if(StringUtils.isNotEmpty(orderId)&&orderId.equals(order.getId().toString())){
             return R.error("正在支付中...");
         }
+        try{
+            if(order.getPayType().equals("3") && order.getPayPrice().compareTo(order.getPayMoney()) == 0){
+                order.setPayType("1");
+                FsStoreOrderScrm fsStoreOrderScrm = new FsStoreOrderScrm();
+                fsStoreOrderScrm.setId(param.getOrderId());
+                fsStoreOrderScrm.setPayType("1");
+                fsStoreOrderMapper.updateFsStoreOrder(fsStoreOrderScrm);
+            }
+        }catch (Exception e){
+
+        }
 
         FsUserScrm user=userService.selectFsUserById(order.getUserId());
         if(user!=null){
@@ -3829,7 +3840,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                         Map<String, Object> resultMap = JSON.parseObject(result.getPay_info(), new TypeReference<Map<String, Object>>() {});
                         String s = (String) resultMap.get("package");
                         resultMap.put("packageValue",s);
-                        return R.ok().put("payType",param.getPayType()).put("result",resultMap);
+                        return R.ok().put("payType",1).put("result",resultMap);
                     }
                     else{
                         return R.error(result.getResp_desc());