Merge remote-tracking branch 'origin/openIm' into openIm

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

@@ -99,6 +99,10 @@ public class FsUserAddressController extends BaseController
         String kdnAddress = fsUserAddressService.getKdnAddress(address);
         AddressInfoDTO addressInfoDTO = JSON.parseObject(kdnAddress, AddressInfoDTO.class);
         AddressInfoDTO.AddressData data = addressInfoDTO.getData();
+        logger.info("快递鸟返回："+kdnAddress);
+        if (data==null){
+            return AjaxResult.error("解析地址失败请输入正确地址");
+        }
         String provinceName = data.getProvinceName();
         if (!provinceName.contains("省") && !provinceName.contains("区")){
             data.setProvinceName(data.getProvinceName()+"市");

fs-company/src/main/java/com/fs/company/controller/company/CompanyUserController.java

@@ -579,7 +579,7 @@ public class CompanyUserController extends BaseController
             requestBody = new JSONObject();
             userIds.add(userId);
             requestBody.put("checkUserIDs", userIds);
-            String body = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/account_check")
+            String body = HttpRequest.post("https://web.im.ysya.top/api/user/account_check")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .header("token", adminToken)
                     .body(requestBody.toString())
@@ -606,7 +606,7 @@ public class CompanyUserController extends BaseController
                     requestBody = new JSONObject();
                     userIds.add(userId);
                     requestBody.put("users", users);
-                    HttpRequest.post("https://web.im.cdwjyyh.com/api/user/user_register")
+                    HttpRequest.post("https://web.im.ysya.top/api/user/user_register")
                             .header("operationID", String.valueOf(System.currentTimeMillis()))
                             .header("token", adminToken).body(requestBody.toString()).execute().body();
                 }
@@ -619,7 +619,7 @@ public class CompanyUserController extends BaseController
             requestBody = new JSONObject();
             requestBody.put("platformID",5);
             requestBody.put("userID",userId);
-            String body1 = HttpRequest.post("https://web.im.cdwjyyh.com/api/auth/get_user_token")
+            String body1 = HttpRequest.post("https://web.im.ysya.top/api/auth/get_user_token")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .header("token", adminToken)
                     .body(requestBody.toString()).execute().body();

fs-doctor-app/src/main/java/com/fs/app/controller/DoctorController.java

@@ -121,7 +121,7 @@ public class DoctorController extends  AppBaseController {
             requestBody = new JSONObject();
             userIds.add(userId);
             requestBody.put("checkUserIDs", userIds);
-            String body = HttpRequest.post("https://web.im.cdwjyyh.com/api/user/account_check")
+            String body = HttpRequest.post("https://web.im.ysya.top/api/user/account_check")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .header("token", adminToken)
                     .body(requestBody.toString())
@@ -148,7 +148,7 @@ public class DoctorController extends  AppBaseController {
                     requestBody = new JSONObject();
                     userIds.add(userId);
                     requestBody.put("users", users);
-                    HttpRequest.post("https://web.im.cdwjyyh.com/api/user/user_register")
+                    HttpRequest.post("https://web.im.ysya.top/api/user/user_register")
                             .header("operationID", String.valueOf(System.currentTimeMillis()))
                             .header("token", adminToken).body(requestBody.toString()).execute().body();
                 }
@@ -161,7 +161,7 @@ public class DoctorController extends  AppBaseController {
             requestBody = new JSONObject();
             requestBody.put("platformID",5);
             requestBody.put("userID",userId);
-            String body1 = HttpRequest.post("https://web.im.cdwjyyh.com/api/auth/get_user_token")
+            String body1 = HttpRequest.post("https://web.im.ysya.top/api/auth/get_user_token")
                     .header("operationID", String.valueOf(System.currentTimeMillis()))
                     .header("token", adminToken)
                     .body(requestBody.toString()).execute().body();

fs-service/src/main/java/com/fs/company/vo/CompanyUserImportVO.java

@@ -116,7 +116,7 @@ public class CompanyUserImportVO extends BaseEntity {
     private String callerNo;
 
     private String voicePrintUrl;
-
+    @Excel(name = "销售区域编码")
     private String addressId;
 
     /** 看课域名 */

fs-service/src/main/java/com/fs/his/param/FsInquiryOrderPayParam.java

@@ -8,5 +8,5 @@ import java.io.Serializable;
 public class FsInquiryOrderPayParam implements Serializable {
     Long orderId;
     Long userCouponId;
-
+    String appId;
 }

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

@@ -29,6 +29,7 @@ import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsFollowReportMapper;
 import com.fs.his.service.IFsFollowReportService;
@@ -43,6 +44,7 @@ import com.fs.his.service.IFsFollowReportService;
 public class FsFollowReportServiceImpl implements IFsFollowReportService
 {
     @Autowired
+    @Lazy
     private FsFollowReportMapper fsFollowReportMapper;
     @Autowired
     private FsDoctorMapper  doctorMapper;
@@ -50,9 +52,9 @@ public class FsFollowReportServiceImpl implements IFsFollowReportService
     private FsStoreOrderMapper fsStoreOrderMapper;
     @Autowired
     private FsPrescribeMapper fsPrescribeMapper;
+
     @Autowired
-    private IImService imService;
-    @Autowired
+    @Lazy
     SmsServiceImpl smsService;
     Logger logger= LoggerFactory.getLogger(getClass());
     /**

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

@@ -44,6 +44,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import com.fs.his.service.IFsInquiryOrderMsgService;
 
@@ -62,10 +63,12 @@ public class FsInquiryOrderMsgServiceImpl implements IFsInquiryOrderMsgService
     @Autowired
     private IFsFollowReportService fsFollowReportService;
     @Autowired
+    @Lazy
     private FsFollowReportMapper fsFollowReportMapper;
     @Autowired
     private FsDoctorMapper  doctorMapper;
     @Autowired
+            @Lazy
     SmsServiceImpl smsService;
     @Autowired
     FsUserMapper fsUserMapper;

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

@@ -749,6 +749,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             inquiryOrderService.createOrderByPackageOrder(order);
         }
         if (packageSubType!=1){
+            logger.info("创建订单2");
             storeOrderService.createOrderByPackageOrder(order);
             logger.info("创建订单");
         }
@@ -759,6 +760,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             u.setIsBuy(1);
             fsUserService.updateFsUser(u);
         }
+        logger.info("更新完成");
         return R.ok();
     }
 

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

@@ -528,6 +528,7 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
         if (fsDoctor==null){
             throw new CustomException("医生查询错误:"+packageOrder.getDoctorId());
         }
+
         fsPrescribe.setPrescribeDoctorId(fsDoctor.getDoctorId());
         fsPrescribe.setPrescribeDoctorSignUrl(fsDoctor.getSignUrl());
 

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

@@ -664,21 +664,25 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
 
     @Override
     public R createOrderByPackageOrder(FsPackageOrder packageOrder) {
+        logger.info("111111111111111");
         if (packageOrder.getDoctorId() == null) {
             Long doctorID = iFsDoctorService.selectFsDoctorDoctorByPackage();
             packageOrder.setDoctorId(doctorID);
         }
+        logger.info("2222222222222");
         FsPackage fsPackage = fsPackageMapper.selectFsPackageByPackageId(packageOrder.getPackageId());
         JSONArray objects = JSONUtil.parseArray(fsPackage.getProductJson());
         List<FsPackagePruductDTO> products = JSONUtil.toList(objects, FsPackagePruductDTO.class);
-
+        logger.info("3333333333333333333");
         Map<String, Object> packageJson = (Map) JSON.parse(packageOrder.getPackageJson());
+        logger.info("55555555555555555555");
         Integer packageSubType = (Integer) packageJson.get("packageSubType");
         if (packageSubType == 3) {
             inquiryOrderService.createOrderByPackageOrderStatus4(packageOrder);
         }
+        logger.info("4444444444444444444");
         Long prescribeId = fsPrescribeService.insertFsPrescribeByPackageOrder(packageOrder);
-
+        logger.info("66666666666666666");
         FsStoreOrder order = new FsStoreOrder();
         List<FsStoreOrderItem> items = new ArrayList<>();
         log.info("套餐包生成药品订单：{}", packageOrder.getOrderSn());

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

@@ -168,6 +168,7 @@ public class InquiryOrderController extends  AppBaseController {
             @Validated @RequestBody FsInquiryOrderPayParam param
     )
     {
+        logger.info("支付"+param.getOrderId()+":"+param.getAppId());
         String json=configService.selectConfigByKey("his.pay");
         PayConfigDTO payConfigDTO= JSONUtil.toBean(json, PayConfigDTO.class);
 
@@ -395,6 +396,7 @@ public class InquiryOrderController extends  AppBaseController {
                     return R.ok().put("isPay",0).put("data",result).put("type","tz");
                 }else if(payConfigDTO.getType().equals("hf")){
                     HuiFuCreateOrder o = new HuiFuCreateOrder();
+                    o.setAppId(param.getAppId());
                     o.setTradeType("T_MINIAPP");
                     o.setOpenid(openId);
                     o.setReqSeqId("inquiry-"+storePayment.getPayCode());
@@ -482,6 +484,15 @@ public class InquiryOrderController extends  AppBaseController {
                     o.setReqSeqId("inquiry-"+storePayment.getPayCode());
                     o.setTransAmt(storePayment.getPayMoney().toString());
                     o.setGoodsDesc("问诊订单支付");
+                    if (o.getAppId()!=null&& !o.getAppId().isEmpty()){
+                        Wrapper<FsUserWx> queryWrapper = Wrappers.<FsUserWx>lambdaQuery()
+                                .eq(FsUserWx::getFsUserId, Long.parseLong(getUserId()))
+                                .eq(FsUserWx::getAppId, payConfigDTO.getAppId());
+                        FsUserWx fsUserWx = fsUserWxMapper.selectOne(queryWrapper);
+                        if (fsUserWx!=null){
+                            o.setOpenid(fsUserWx.getOpenId());
+                        }
+                    }
                     HuifuCreateOrderResult result = huiFuService.createOrder(o);
                     FsStorePayment mt=new FsStorePayment();
                     mt.setPaymentId(storePayment.getPaymentId());

fs-user-app/src/main/java/com/fs/app/controller/store/WxUserScrmController.java

@@ -262,6 +262,10 @@ public class WxUserScrmController extends AppBaseController {
             return R.error("code不存在");
         }
         String courseMa_appId;
+
+        System.out.println("appid"+param.getCode());
+        logger.info("appid"+param.getCode());
+        logger.info("appid"+param.getAppId());
         if(StringUtils.isNotEmpty(param.getAppId())){
             courseMa_appId = configUtil.generateConfigMiniByKey(SysConfigEnum.COURSE_MA_CONFIG.getKey(),param.getAppId()).getString("appid");
         }else{