Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-service-system/src/main/java/com/fs/course/service/impl/FsCourseQuestionBankServiceImpl.java

@@ -133,7 +133,7 @@ public class FsCourseQuestionBankServiceImpl implements IFsCourseQuestionBankSer
     @Transactional
     public R courseAnswer(FsCourseQuestionAnswerUParam param, Boolean isH5User) {
         FsUser user = fsUserMapper.selectFsUserByUserId(param.getUserId());
-        if (StringUtils.isEmpty(user.getMpOpenId())){
+        if (user==null){
             return R.error("未识别到领取信息");
         }
         //获取配置参数

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -696,8 +696,8 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     @Override
     public R sendRewardByFsUser(FsCourseSendRewardUParam param) {
         FsUser user = fsUserMapper.selectFsUserByUserId(param.getUserId());
-        if (StringUtils.isEmpty(user.getMpOpenId())){
-            return R.error("未识别到领取信息");
+        if (user == null){
+            return R.error("未识别到用户信息");
         }
         FsCourseWatchLog log = courseWatchLogMapper.getWatchCourseVideoByFsUser(param.getUserId(), param.getVideoId(), param.getCompanyUserId());
         if (log == null) {
@@ -768,7 +768,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         packetParam.setOpenId(user.getMpOpenId());
         // 来源是小程序切换openId
         if (param.getSource() == 2) {
-            packetParam.setOpenId(user.getCourseMaOpenId());
+            packetParam.setOpenId(user.getMaOpenId());
         }
         packetParam.setAmount(amount);
         packetParam.setSource(param.getSource());

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

@@ -1092,6 +1092,7 @@ public class QwApiServiceImpl implements QwApiService {
             HttpPost httpPost  = new HttpPost(uri);
             HttpResponse response = httpClient.execute(httpPost);
             String reJson = EntityUtils.toString(response.getEntity());
+            System.out.println("尝试获取qwUserName:"+reJson);
             JSONObject jsonObject = JSON.parseObject(reJson);
             name = jsonObject.getString("name");
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsStorePaymentServiceImpl.java

@@ -369,10 +369,13 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
                 config = JSONUtil.toBean(json, RedPacketConfig.class);
                 break;
             case 2:
-                json = companyConfigMapper.selectRedPacketConfigByKey(param.getCompanyId());
+                json = configService.selectConfigByKey("redPacket.config");
                 config = JSONUtil.toBean(json, RedPacketConfig.class);
                 break;
         }
+        if (param.getSource()==2){
+            config.setAppId("wxb9b453d37c5fad45");
+        }
         //组合返回参数
         R result = new R();
         // 根据 isNew 判断使用哪种发红包方式
@@ -382,6 +385,8 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
             result= sendRedPacketLegacyInternal(param, config);
         }
         result.put("isNew",config.getIsNew());
+        result.put("mchId","1716217886");
+        System.out.println("发红包返回"+result);
         return result;
     }
 
@@ -395,6 +400,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
 
         TransferBillsRequest request = new TransferBillsRequest();
         request.setAppid(config.getAppId());
+        System.out.println("appid:"+config.getAppId());
         request.setOpenid(param.getOpenId());
 
         String code = String.valueOf(IdUtil.getSnowflake(0, 0).nextId());

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

@@ -20,6 +20,7 @@ import com.fs.erp.service.IErpGoodsService;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.erp.service.IErpShopService;
 import com.fs.erp.service.IErpUserService;
+import com.fs.his.param.WxSendRedPacketParam;
 import com.fs.pay.pay.domain.OrderResult;
 import com.fs.pay.pay.dto.OrderQueryDTO;
 import com.fs.pay.pay.service.PayService;
@@ -146,18 +147,6 @@ public class CommonController extends AppBaseController {
 
 
 
-//	@ApiOperation("testGetOrder")
-//	@GetMapping("testGetOrder")
-//	public R testGetOrder(String orderId) throws Exception
-//	{
-//		PayApiServiceImpl payService = new PayApiServiceImpl();
-//		OrderQueryDTO o = new OrderQueryDTO();
-////        o.setLowOrderId("orderWx123456121");
-//		o.setUpOrderId(orderId);
-//		OrderResult order = payService.getOrder(o);
-//
-//		return R.ok().put("data",order);
-//	}
 
 
 //	@ApiOperation("同步企业金额")