卓美优化退款、新增课程小节异常、静默授权

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

@@ -76,6 +76,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -210,6 +211,9 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
     @Autowired
     private CloudHostProper cloudHostProper;
 
+    @Value("${cloud_host.company_name}")
+    private String companyName;
+
     /**
      * 查询售后记录
      *
@@ -975,10 +979,18 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
 
                         Map<String, Object> extendInfoMap = new HashMap<>();
                         if (order.getPayType().equals("99")){
-                            request.setOrdAmt(payment.getPayMoney().setScale(2, RoundingMode.DOWN).toString());
+                            if("北京卓美".equals(companyName)){
+                                request.setOrdAmt(refundAmount.setScale(2, RoundingMode.DOWN).toString());
+                            }else {
+                                request.setOrdAmt(payment.getPayMoney().setScale(2, RoundingMode.DOWN).toString());
+                            }
                             extendInfoMap.put("org_req_seq_id", "store-"+payment.getPayCode());
                         }else {
-                            request.setOrdAmt(payment.getPayMoney().toString());
+                            if("北京卓美".equals(companyName)){
+                                request.setOrdAmt(refundAmount.setScale(2, RoundingMode.DOWN).toString());
+                            }else{
+                                request.setOrdAmt(payment.getPayMoney().toString());
+                            }
                             extendInfoMap.put("org_party_order_id", payment.getBankSerialNo());
                             request.setAppId(payment.getAppId());
                         }

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

@@ -897,7 +897,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     public R createOrder(long userId, FsStoreOrderCreateParam param) {
 
         FsUserCompanyUser fsUserCompanyUser = fsUserCompanyUserMapper.selectFsUserCompanyUserByUserId(userId);
-        if (ObjectUtil.isNotEmpty(fsUserCompanyUser) && param.getVideoId()!=null){
+        if (ObjectUtil.isNotEmpty(fsUserCompanyUser) && param.getVideoId()!=null && param.getCompanyId() == null){
             param.setCompanyId(fsUserCompanyUser.getCompanyId());
             param.setCompanyUserId(fsUserCompanyUser.getCompanyUserId());
         }
@@ -960,7 +960,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             StoreConfig config= JSONUtil.toBean(json, StoreConfig.class);
 
             //卓美商城正常下单
-            if("北京卓美".equals(companyName) && param.getVideoId()!=null || !"北京卓美".equals(companyName)){
+            if("北京卓美".equals(companyName) && param.getVideoId()!=null && storeOrder.getCompanyId() == null || !"北京卓美".equals(companyName)){
                 //绑定销售
                 FsUserScrm fsuser= userService.selectFsUserById(userId);
                 if(ObjectUtil.isEmpty(config.getOrderAttribution())

fs-service/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -144,11 +144,11 @@
             <if test="viewStartTime != null">#{viewStartTime},</if>
             <if test="viewEndTime != null">#{viewEndTime},</if>
             <if test="lastJoinTime != null">#{lastJoinTime},</if>
+            <if test="projectId != null">#{projectId},</if>
             <if test="isProduct != null">#{isProduct},</if>
             <if test="productId != null">#{productId},</if>
             <if test="listingStartTime != null">#{listingStartTime},</if>
             <if test="listingEndTime != null">#{listingEndTime},</if>
-            <if test="projectId != null">#{projectId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="isFirst != null">#{isFirst},</if>
             <if test="isSpeed != null">#{isSpeed},</if>

fs-user-app/src/main/java/com/fs/app/controller/course/CourseFsUserLoginController.java

@@ -37,6 +37,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -85,6 +86,9 @@ public class CourseFsUserLoginController extends AppBaseController {
     @Autowired
     private IFsUserCompanyUserService userCompanyUserService;
 
+    @Value("${cloud_host.company_name}")
+    private String companyName;
+
     @ApiOperation("小程序-授权登录")
     @PostMapping("/loginByMa")
     @UserOperationLog(operationType = FsUserOperationEnum.MINLOGIN)
@@ -219,6 +223,9 @@ public class CourseFsUserLoginController extends AppBaseController {
         if (param.getAuthType() == 1 && phoneNoInfo != null) {
             userMap.setPhone(phoneNoInfo.getPhoneNumber());
         }
+        if("北京卓美".equals(companyName)){
+            userMap.setMaOpenId(session.getOpenid());
+        }
         String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
         userMap.setLastIp(ipAddr);
         userService.updateFsUser(userMap);