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

fs-admin/src/main/java/com/fs/course/controller/FsVideoResourceController.java

@@ -10,6 +10,7 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.core.redis.RedisCache;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.course.config.CourseConfig;
@@ -43,9 +44,10 @@ public class FsVideoResourceController extends BaseController {
 
     private final IFsVideoResourceService fsVideoResourceService;
 
+    @Autowired
+    RedisCache redisCache;
     @Autowired
     private TokenService tokenService;
-
     @Autowired
     private ISysConfigService configService;
     @Autowired
@@ -53,6 +55,8 @@ public class FsVideoResourceController extends BaseController {
     @Autowired
     private IFsUserCourseVideoService fsUserCourseVideoService;
 
+    private final String COURSE_VIDEO_KEY = "h5wxuser:video:duration:";
+
     /**
      * 查询视频素材库列表
      */
@@ -152,6 +156,12 @@ public class FsVideoResourceController extends BaseController {
                     c.setThumbnail(fsVideoResource.getThumbnail());//视频课节封面
                     c.setDuration(fsVideoResource.getDuration().longValue());//视频时长
                     fsUserCourseVideoService.updateFsUserCourseVideo(c);//更新数据
+
+                    //更新缓存视频时长
+                    String key = COURSE_VIDEO_KEY + c.getVideoId();
+                    if(redisCache.hasKey(key)){
+                        redisCache.setCacheObject(key, c.getDuration());
+                    }
                 });
             }
         }

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

@@ -28,6 +28,8 @@ import com.fs.his.service.IFsInquiryOrderService;
 import com.fs.his.service.IFsUserWxService;
 import com.fs.his.utils.qrcode.QRCodeUtils;
 import com.fs.hisStore.config.MedicalMallConfig;
+import com.fs.hisStore.domain.FsStoreOrderScrm;
+import com.fs.hisStore.service.impl.FsStoreOrderScrmServiceImpl;
 import com.fs.qw.domain.QwCompany;
 import com.fs.qw.domain.QwExternalContact;
 import com.fs.qw.mapper.QwExternalContactMapper;
@@ -151,6 +153,9 @@ public class CommonController {
     @Autowired
     private IFsCourseWatchLogService courseWatchLogService;
 
+    @Autowired
+    private FsStoreOrderScrmServiceImpl fsStoreOrderScrmService;
+
     /**
      * 获取跳转微信小程序的链接地址
      */
@@ -437,4 +442,12 @@ public class CommonController {
         courseWatchLogService.scheduleUpdateDurationToDatabaseText();
     }
 
+    @GetMapping("/erp/{orderId}")
+    public R erp(@PathVariable Long orderId){
+        FsStoreOrderScrm storeOrderScrm =new FsStoreOrderScrm();
+        storeOrderScrm.setId(orderId);
+        storeOrderScrm.setUserAddress("测试- --- --11111");
+        fsStoreOrderScrmService.pushOrderAddressToErp(storeOrderScrm);
+        return null;
+    }
 }

fs-service/src/main/java/com/fs/erp/service/impl/JSTErpOrderServiceImpl.java

@@ -295,7 +295,8 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
             // 货到付款要推两次
             PaymentDTO paymentDTO2 = new PaymentDTO();
             // 物流代收金额
-            paymentDTO2.setAmount(fsStoreOrder.getTotalPrice().subtract(fsStoreOrder.getPayPrice()).doubleValue());
+//            paymentDTO2.setAmount(fsStoreOrder.getTotalPrice().subtract(fsStoreOrder.getPayPrice()).doubleValue());
+            paymentDTO2.setAmount(fsStoreOrder.getPayMoney().doubleValue());//已沟通改为实际支付金额
             paymentDTO2.setOuterPayId(String.format("%s%d",order.getPlatform_code(),1));
             paymentDTO2.setPayDate(order.getDeal_datetime());
             paymentDTO2.setPayment("货到付款");

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

@@ -363,6 +363,7 @@ public class AppLoginController extends AppBaseController{
             return R.error("微信授权失败");
         }
         param.setUnionid(unionid);
+        param.setOpenId(openid);
         param.setNickName(nickname);
         param.setAvatar(avatar);
         // 手机号不存在，根据unionid查询
@@ -416,6 +417,9 @@ public class AppLoginController extends AppBaseController{
         newUser.setPhone(param.getPhone());
         newUser.setCreateTime(new Date());
         newUser.setStatus(1);
+        if(StringUtils.isNotBlank(param.getOpenId())){
+            newUser.setMaOpenId(param.getOpenId());
+        }
         if(StringUtils.isNotBlank(param.getUnionid())){
             newUser.setUnionId(param.getUnionid());
         }