代码合并

fs-admin/src/main/java/com/fs/his/controller/FsStoreOrderController.java

@@ -413,9 +413,9 @@ public class FsStoreOrderController extends BaseController
                 if (erpType == 1){
                     //管易
                     erpOrderService =  gyOrderService;
-                } else if (erpType == 2){
+                } else if (erpType == 2) {
                     //旺店通
-                    erpOrderService =  wdtOrderService;
+                    erpOrderService = wdtOrderService;
                 } else if (erpType == 3){
                     //
                     erpOrderService =  hzOMSErpOrderService;
@@ -538,32 +538,31 @@ public class FsStoreOrderController extends BaseController
     @ApiOperation("批量创建ERP订单")
     @PreAuthorize("@ss.hasPermi('his:storeOrder:createErpOrder')")
     @PostMapping(value = "/batchCreateErpOrder")
-    public R batchCreateErpOrder(@RequestBody FsStoreOrderSetErpPhoneParam param)
-    {
+    public R batchCreateErpOrder(@RequestBody FsStoreOrderSetErpPhoneParam param) {
         String loginAccount = param.getLoginAccount();
-        if (StringUtils.isBlank(loginAccount)){
+        if (StringUtils.isBlank(loginAccount)) {
             return R.error("未选择推送erp账户");
         }
         FsStoreOrderDf df = getDFInfo(loginAccount);
-        if (df.getLoginAccount() == null){
+        if (df.getLoginAccount() == null) {
             return R.error("未查询到所选erp账户");
         }
         List<Long> orderIds = param.getOrderIds();
-        if (orderIds  == null || orderIds.isEmpty()) {
+        if (orderIds == null || orderIds.isEmpty()) {
             if (param.getUserPhoneMk() != null && !param.getUserPhoneMk().isEmpty()) {
                 param.setUserPhone(encryptPhone(param.getUserPhoneMk()));
             }
             List<FsStoreOrderListVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
             orderIds = list.stream().map(FsStoreOrderListVO::getOrderId).collect(Collectors.toList());
         }
-        if (orderIds.isEmpty()){
+        if (orderIds.isEmpty()) {
             return R.ok();
         }
-        orderIds.forEach(orderId->{
+        orderIds.forEach(orderId -> {
             try {
                 df.setOrderId(orderId);
                 FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
-                if (temp == null){
+                if (temp == null) {
                     fsStoreOrderDfService.insertFsStoreOrderDf(df);
                 }
                 fsStoreOrderService.createOmsOrder(orderId);
@@ -573,7 +572,7 @@ public class FsStoreOrderController extends BaseController
 
         });
         return R.ok();
-}
+    }
     @ApiOperation("批量设置订单账户")
     @PreAuthorize("@ss.hasPermi('his:storeOrder:createErpOrder')")
     @PostMapping(value = "/batchSetErpOrder")
@@ -608,6 +607,7 @@ public class FsStoreOrderController extends BaseController
                 fsStoreOrderDfService.insertFsStoreOrderDf(df);
             }
         });
+        return R.ok().put("data",df);
     }
 
     private FsStoreOrderDf getDFInfo(String loginAccount) {

fs-qw-task/src/main/java/com/fs/app/controller/CommonController.java

@@ -99,8 +99,6 @@ public class CommonController {
     @Autowired
     private IFsInquiryOrderService inquiryOrderService;
 
-    @Autowired
-    private ISopUserLogsInfoService iSopUserLogsInfoService;
 
 
     /**

fs-service/src/main/java/com/fs/his/service/IFsStoreOrderService.java

@@ -230,7 +230,6 @@ public interface IFsStoreOrderService
      * @return //, Long storeId
      */
     FsStoreOrder getOrderByOrderCodeAndStoreId(String orderCode);
-
     int updateStoreOrderDeliveryInfo(FsStoreOrder order);
 
     ErpOrderQueryResponse getHzOMSErpOrder(String extendOrderId);

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -3141,6 +3141,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         return fsStoreOrderMapper.batchUpdateErpByOrderIds(maps);
     }
 
+    @Override
+    public FsStoreOrder getOrderByOrderCodeAndStoreId(String orderCode) {
+        return fsStoreOrderMapper.getOrderByOrderCodeAndStoreId(orderCode);
+    }
+
     public boolean containsAddress(String companyName) {
         String[] items = {"新疆", "西藏", "内蒙古", "海南"};
         boolean found = false;
@@ -3153,15 +3158,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         return found;
     }
 
-    /**
-     * 更改为只用订单号查询 2025-7-21
-     * @param orderCode
-     * @return //, Long storeId
-     */
-    @Override
-    public FsStoreOrder getOrderByOrderCodeAndStoreId(String orderCode, Long storeId) {
-        return fsStoreOrderMapper.getOrderByOrderCodeAndStoreId(orderCode, storeId);
-    }
 
     @Override
     public int updateStoreOrderDeliveryInfo(FsStoreOrder order) {

fs-service/src/main/java/com/fs/qw/service/impl/QwContactWayServiceImpl.java

@@ -28,6 +28,7 @@ import com.fs.qwApi.param.QwListContactWayParam;
 import com.fs.qwApi.param.SendWelcomeMsgParam;
 import com.fs.qwApi.service.QwApiService;
 import com.fs.voice.utils.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,7 @@ import java.util.*;
  * @date 2024-07-05
  */
 @Service
+@Slf4j
 public class QwContactWayServiceImpl implements IQwContactWayService
 {
     private static final Logger log = LoggerFactory.getLogger(QwContactWayServiceImpl.class);
@@ -317,7 +319,9 @@ public class QwContactWayServiceImpl implements IQwContactWayService
     public R selectQwContactWaysync(String corpId) {
         QwListContactWayParam qwListContactWayParam = new QwListContactWayParam();
         qwListContactWayParam.setStart_time("1622476800");
+        log.info("同步企微外部联系人 参数 {} {}",qwListContactWayParam,corpId);
         QwListContactWayReslut qwListContactWayReslut = qwApiService.listContactWay(qwListContactWayParam, corpId);
+        log.info("同步企微外部联系人返回结果 {}",qwListContactWayReslut);
         List<QwGetContactWayParam> contactWay = qwListContactWayReslut.getContact_way();
         for (QwGetContactWayParam qwGetContactWayParam : contactWay) {
             String configId = qwGetContactWayParam.getConfig_id();

fs-service/src/main/java/com/fs/qwApi/service/impl/QwApiServiceImpl.java

@@ -17,6 +17,7 @@ import com.fs.qwApi.enums.Numbers;
 import com.fs.qwApi.param.*;
 import com.fs.qwApi.service.QwApiService;
 import com.fs.voice.utils.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.apache.hc.core5.net.URIBuilder;
 import org.apache.http.HttpEntity;
@@ -41,6 +42,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+@Slf4j
 @Service
 public class QwApiServiceImpl implements QwApiService {
 
@@ -1500,21 +1502,39 @@ public class QwApiServiceImpl implements QwApiService {
         HttpClient httpClient = HttpClients.createDefault();
         QwCompany qwCompany = iQwCompanyService.selectQwCompanyByCorpId(corpId);
         String bookSecret = qwCompany.getServerBookSecret();
+
         try {
             URIBuilder builder = new URIBuilder(QwApiConfig.getUserListUrl);
-            builder.setParameter("access_token", getToken(corpId,bookSecret));
-//            builder.setParameter("access_token", getBookAccessToken(qwGetCorpTokenParam, suiteToken));
+            String accessToken = getToken(corpId, bookSecret);
+            builder.setParameter("access_token", accessToken);
             URI uri = builder.build();
-            HttpPost  httpPost  = new HttpPost(uri);
+
+            // 打印请求URL
+            log.info("Request URL: {}", uri.toString());
+
+            HttpPost httpPost = new HttpPost(uri);
             Map<String, Object> map = new HashMap<>();
             map.put("limit", 10000);
-            httpPost.setEntity( new StringEntity(JSON.toJSONString(map)));
+
+            String requestBody = JSON.toJSONString(map);
+            // 打印请求体
+            log.info("Request Body: {}", requestBody);
+
+            httpPost.setEntity(new StringEntity(requestBody));
+
             HttpResponse response = httpClient.execute(httpPost);
             String reJson = EntityUtils.toString(response.getEntity());
+
+            // 打印响应内容
+            log.info("Response: {}", reJson);
+
             QwUserIdResult qwResult = JSON.parseObject(reJson, QwUserIdResult.class);
 
+            log.info("Successfully parsed response for corpId: {}", corpId);
+
             return qwResult;
         } catch (Exception e) {
+            log.error("Error occurred while getting user list for corpId: {}", corpId, e);
             e.printStackTrace();
         }
         return null;

fs-service/src/main/resources/application-config-druid-yzt.yml

@@ -81,6 +81,8 @@ headerImg:
   imgUrl: https://yztcourse-1325300895.cos.ap-guangzhou.myqcloud.com/yztcourse/20250523/e04871a98cc84be39a7f60c084698e21.jpg
 ipad:
   ipadUrl: http://ipad.cdwjyyh.com
+  aiApi: http://152.136.202.157:3000/api
+
 wx_miniapp_temp:
   pay_order_temp_id:
   inquiry_temp_id:

fs-user-app/src/main/java/com/fs/app/controller/ArticleController.java

@@ -41,7 +41,6 @@ public class ArticleController {
 	@Autowired
 	private IFsArticleCateService articleCateService;
 
-	@Cacheable(value="getArticleCateList")
 	@ApiOperation("获取文章分类列表")
 	@GetMapping("/getArticleCateList")
 	public R getArticleCateList(){
@@ -50,7 +49,6 @@ public class ArticleController {
 		return R.ok().put("data",list);
 	}
 	@ApiOperation("获取文章列表")
-	@Cacheable(value="getArticleList", key="#param")
 	@GetMapping("/getArticleList")
 	public R getArticleList(FsArticleListUParam param){
 		PageHelper.startPage(param.getPageNum(), param.getPageSize());

fs-user-app/src/main/java/com/fs/app/controller/WxUserController.java

@@ -174,123 +174,6 @@ public class WxUserController extends AppBaseController{
     }
 
 
-
-    /**
-     * 看课互医小程序登陆接口
-     */
-    @ApiOperation("看课互医小程序登陆接口")
-    @PostMapping("/loginCourseHis")
-    @Transactional
-    public R loginCourseHis( @RequestBody LoginParam param) {
-
-        if (StringUtils.isBlank(param.getCode())) {
-            return R.error("code不存在");
-        }
-
-        String appid="";
-
-        if(!StringUtil.isNullOrEmpty(param.getAppId())){
-            appid=param.getAppId();
-        }else {
-            FsSysConfig con = configUtil.getSysConfig();
-            appid = con.getAppid();
-        }
-
-//        final WxMaService wxService = WxMaConfiguration.getMaService(con.getAppid());
-        final WxMaService wxService = WxMaConfiguration.getMaService(appid);
-        try {
-            WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
-            this.logger.info(session.getSessionKey());
-            this.logger.info(session.getOpenid());
-            // 解密
-            WxMaPhoneNumberInfo phoneNoInfo = wxService.getUserService().getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
-            //三端用户同步，先用unionid查询
-            FsUser user = new FsUser();
-            if (session.getUnionid()!=null){
-                user = userService.selectFsUserByUnionid(session.getUnionid());
-                if (user==null){
-                    user = userService.selectFsUserByCourseOpenId(session.getOpenid());
-                }
-            }else {
-                user = userService.selectFsUserByCourseOpenId(session.getOpenid());
-            }
-
-            if(user==null){
-                //新用户
-                String phoneNumber = phoneNoInfo.getPhoneNumber();
-
-
-                //查询手机号是否存在，如果存在，更新
-                FsUser checkPhone=userService.selectFsUserByPhone(encryptPhone(phoneNumber));
-                if (checkPhone==null){
-                    checkPhone=userService.selectFsUserByPhone(phoneNumber);
-                }
-                if(checkPhone!=null){
-                    user=checkPhone;
-                    FsUser userMap=new FsUser();
-                    userMap.setCourseMaOpenId(session.getOpenid());
-                    userMap.setUserId(checkPhone.getUserId());
-                    userMap.setUpdateTime(new DateTime());
-                    if(session.getUnionid()!=null){
-                        userMap.setUnionId(session.getUnionid());
-                    }
-                    userService.updateFsUser(userMap);
-                }
-                else{
-                    //写入
-                    user=new FsUser();
-                    user.setPhone(phoneNoInfo.getPhoneNumber());
-                    user.setNickName("微信用户"+phoneNoInfo.getPhoneNumber().substring(phoneNoInfo.getPhoneNumber().length()-4));
-                    user.setAvatar("https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230725/a848605591384ec29d49773dd58d9345.jpg");
-                    user.setStatus(1);
-                    user.setCourseMaOpenId(session.getOpenid());
-                    user.setCreateTime(new Date());
-                    if(session.getUnionid()!=null){
-                        user.setUnionId(session.getUnionid());
-                    }
-                    userService.insertFsUser(user);
-                }
-            }
-            else{
-                if(user.getStatus().equals(0)){
-
-                    return R.error("此会员已禁用");
-                }
-                FsUser userMap=new FsUser();
-                userMap.setUserId(user.getUserId());
-                if(session.getUnionid()!=null){
-                    userMap.setUnionId(session.getUnionid());
-                }
-                userMap.setCourseMaOpenId(session.getOpenid());
-                userMap.setPhone(phoneNoInfo.getPhoneNumber());
-                userMap.setUpdateTime(new DateTime());
-                userService.updateFsUser(userMap);
-            }
-            String token = jwtUtils.generateToken(user.getUserId());
-//            redisCache.setCacheObject("token:"+user.getUserId(),token,365, TimeUnit.DAYS);
-            Map<String,Object> map=new HashMap<>();
-            map.put("token",token);
-            user.setPhone(encryptPhone(phoneNoInfo.getPhoneNumber()));
-            map.put("user",user);
-            FsUserLoginLog log = new FsUserLoginLog();
-            log.setCode(param.getCode());
-            log.setLoginJson(JSON.toJSONString(param));
-//            log.setUserRegisterJson(JSON.toJSONString(jsonMap));
-            log.setStatus(1);
-            log.setUserId(user.getUserId());
-            log.setPhone(user.getPhone());
-            log.setMaOpenId(user.getMaOpenId());
-            log.setCreateTime(DateUtils.getNowDate());
-            fsUserLoginLogMapper.insertFsUserLoginLog(log);
-            return R.ok(map);
-        } catch (WxErrorException e) {
-            //this.logger.error(e.getMessage(), e);
-            return R.error("授权失败,"+e.getMessage());
-        }
-    }
-
-
-
     /**
      * 看课互医小程序登陆接口
      */