Merge branch 'dev'

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -12,6 +12,7 @@ import com.zhongzheng.modules.goods.vo.GoodsUserVo;
 import com.zhongzheng.modules.goods.vo.UserNewGoodsVo;
 import com.zhongzheng.modules.order.bo.SpecialQuestionBo;
 import com.zhongzheng.modules.order.vo.SpecialQuestionVo;
+import com.zhongzheng.modules.user.bo.UserAppTelphoneLoginBo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程Controller
@@ -217,4 +219,13 @@ public class CourseController extends BaseController {
         return AjaxResult.success(iCourseService.getOldGoodsList(loginUser.getUser().getUserId()));
     }
 
+
+    @ApiOperation("获取跳转用户Key")
+    @GetMapping("/skipPort")
+    public AjaxResult<Map<String,String>> getUserSkipPort() {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        Map<String,String> map = iCourseService.getUserSkipPort(loginUser.getUser().getUserId());
+        return AjaxResult.success(map);
+    }
+
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.base.vo.BaseFilterVo;
 import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
 import com.zhongzheng.modules.course.vo.CourseEducationTypeVo;
 import com.zhongzheng.modules.goods.bo.GoodsFirstChoiceAddBo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
@@ -237,4 +238,10 @@ public class OrderController extends BaseController {
         bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(iOrderGoodsService.firstChoiceGoods(bo));
     }
+
+    @ApiOperation("获取课程视频标签")
+    @GetMapping("/getViewSign/{orderGoodsId}")
+    public AjaxResult<GoodsVo> getCourseViewSign(@PathVariable("orderGoodsId") Long orderGoodsId) {
+        return AjaxResult.success(iOrderGoodsService.getCourseViewSign(orderGoodsId));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

@@ -227,7 +227,6 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
                 }else if(chapterVo.getCommonSign()==1){
                     publicTotalTime=publicTotalTime.add(new BigDecimal(courseMenuMapper.countChapterTotalTime(chapterVo.getChapterId())));
                 }
-
             }
             goodsVo.setClassHours(totalTime.divide(new BigDecimal(45*60),BigDecimal.ROUND_HALF_UP));
             goodsVo.setPublicClassHours(publicTotalTime.divide(new BigDecimal(45*60),BigDecimal.ROUND_HALF_UP));

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseService.java

@@ -110,4 +110,6 @@ public interface ICourseService extends IService<Course> {
 	Map<String,String> getSpecialQuestionSkipCode(Long userId);
 
 	UserNewGoodsVo getOldGoodsList(Long userId);
+
+    Map<String, String> getUserSkipPort(Long userId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -1158,6 +1158,32 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         return vo;
     }
 
+    @Override
+    public Map<String, String> getUserSkipPort(Long userId) {
+        User user = iUserService.getById(userId);
+        if (ObjectUtils.isNull(user)){
+            throw new CustomException("用户信息错误！");
+        }
+        //新系统有账号
+        Long tenantId = user.getTenantId();
+        //缓存用户信息key
+        String key = String.format("KQTZ%s", user.getUserId());
+        SysTenant sysTenant = iSysTenantService.getById(tenantId);
+        //课程
+        String domain = String.format("%s%s", URL_PREFIX, sysTenant.getHostH5());
+        HashMap<String, String> map = new HashMap<>();
+        map.put("domain", domain);
+        map.put("skipPort", key);
+        UserPhoneBo phoneBo = new UserPhoneBo();
+        phoneBo.setTelphone(EncryptHandler.decrypt(user.getTelphone()));
+        phoneBo.setTenantId(tenantId);
+        phoneBo.setIdNum(EncryptHandler.decrypt(user.getIdCard()));
+
+        //缓存用户信息
+        redisCache.setCacheObjectTenant(tenantId + ":" + key, JSONObject.toJSONString(phoneBo), 12, TimeUnit.HOURS);
+        return map;
+    }
+
     private Long liveTime(Long nowTime, Integer day) {
         for (Integer i = 0; i < day; i++) {
             Long dayAfter = DateUtils.getDayAfter(nowTime, 1);

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -183,4 +183,6 @@ private static final long serialVersionUID=1L;
     private Integer moreCertificateStatus;
     /** 关联题库ids */
     private String questionRelIds;
+    /** 视频标签：1保利威 2腾讯 */
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -401,4 +401,7 @@ public class GoodsVo {
 	/** 关联题库ids */
 	@ApiModelProperty("关联题库ids")
 	private String questionRelIds;
+	/** 视频标签：1保利威 2腾讯 */
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -313,7 +313,6 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             String businessName = iGoodsService.getGoodsBusinessName(goodsId);
             if (businessName.contains("继续教育") && businessName.contains("施工现场专业人员")) {
                 String sevenYear = goods.getSevenYear();
-                if (!Arrays.asList("2024").contains(sevenYear)){
                     List<ClassGradeInterface> interfaceList = iClassGradeInterfaceService
                             .list(new LambdaQueryWrapper<ClassGradeInterface>()
                                     .in(ClassGradeInterface::getType, Arrays.asList(1, 3))
@@ -331,7 +330,6 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                     }
                     String sevenCode = getSevenCode(goodsId,add.getStudentUpper());
                     add.setSevenCode(sevenCode);
-                }
             }
             else if (("继续教育二级建造师".equals(businessName)|| ("继续教育二级造价师".equals(businessName))) && sysTenant.getShareClass() == 1){
                 erJfalg = true;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderGoodsService.java

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.goods.bo.GoodsFirstChoiceAddBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.bo.GoodsSectionListBo;
 import com.zhongzheng.modules.goods.vo.GoodsSectionListVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
@@ -129,4 +130,6 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
     GoodsFirstChoiceAddBo firstChoiceGoods(GoodsFirstChoiceAddBo bo);
 
     OrderGoods getByIdNoTenant(Long orderGoodsId);
+
+    GoodsVo getCourseViewSign(Long orderGoodsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -881,6 +881,16 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return baseMapper.getByIdNoTenant(orderGoodsId);
     }
 
+    @Override
+    public GoodsVo getCourseViewSign(Long orderGoodsId) {
+        OrderGoods orderGoods = getById(orderGoodsId);
+        if (ObjectUtils.isNull(orderGoods)){
+            throw new CustomException("订单有误，请检查");
+        }
+        Goods goods = iGoodsService.getById(orderGoods.getGoodsId());
+        return BeanUtil.toBean(goods,GoodsVo.class);
+    }
+
     private boolean checkUnique(Long GoodsId,Long UserId) {
         ShoppingCart info = iShoppingCartService.getOne(new LambdaQueryWrapper<ShoppingCart>()
                 .eq(ShoppingCart::getUserId,UserId).eq(ShoppingCart::getGoodsId,GoodsId).last("limit 1"));

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -2432,7 +2432,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
             int locakStudentNum = 0;
             Boolean sevenFlag = false;
-            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员") && !Arrays.asList("2024").contains(sevenYear)){
+            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
                 if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                     //七大员继教班级共享
                     locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGradeVo.getSevenCode());
@@ -2480,7 +2480,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             int locakStudentNum = 0;
             Boolean sevenFlag = false;
             if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                    && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2024").contains(goods.getSevenYear())){
+                    && StringUtils.isNotBlank(goods.getSevenYear())){
                 if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                     //七大员继教班级共享
                     locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGradeVo.getSevenCode());
@@ -2531,7 +2531,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (businessFullName.contains("继续教育") && businessFullName.contains("施工现场专业人员")){
                 //七大员继教
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
-                if (!Arrays.asList("2024").contains(sevenYear)){
                     //班级绑定学员资料推送和学时推送
                     List<ClassGradeInterface> list = iClassGradeInterfaceService.list(new LambdaQueryWrapper<ClassGradeInterface>()
                             .eq(ClassGradeInterface::getStatus, 1)
@@ -2551,7 +2550,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     }else {
                         classGrade.setSevenCode(getSevenCode(goodsId));
                     }
-                }
             }else {
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
             }
@@ -2582,7 +2580,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //七大员继教同一个专业下同一个班级名称
         Boolean classFlag = true;
         if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2024").contains(goods.getSevenYear())){
+                && StringUtils.isNotBlank(goods.getSevenYear())){
             List<ClassGrade> gradeName = new ArrayList<>();
             if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                 //七大员继教班级共享

zhongzheng-system/src/main/java/com/zhongzheng/modules/tencentcloud/service/impl/VodServiceImpl.java

@@ -87,18 +87,19 @@ public class VodServiceImpl implements IVodService {
     public Map<String, Object> vodSignRequest(String FileId) {
         Integer AppId = 1306117675;
     //    String FileId = "4564972818519602447";
-        String AudioVideoType = "RawAdaptive";
+    //    String AudioVideoType = "RawAdaptive";
+        String AudioVideoType = "Original";
         Integer RawAdaptiveDefinition = 10;
         Integer ImageSpriteDefinition = 10;
         Long CurrentTime = DateUtils.getNowTime();
         Long PsignExpire = DateUtils.getNowTime()+12*3600;
         String UrlTimeExpire = Long.toHexString(PsignExpire);
-        String PlayKey = "TxtyhLlgo7J3iOADIron";
+        String PlayKey = "BlLcfriLPbYKPG1PWbzQ";
         HashMap<String, Object> urlAccessInfo = new HashMap<String, Object>();
         urlAccessInfo.put("t", UrlTimeExpire);
         HashMap<String, Object> contentInfo = new HashMap<String, Object>();
         contentInfo.put("audioVideoType", AudioVideoType);
-    //    contentInfo.put("rawAdaptiveDefinition", RawAdaptiveDefinition);
+        contentInfo.put("rawAdaptiveDefinition", RawAdaptiveDefinition);
         contentInfo.put("imageSpriteDefinition", ImageSpriteDefinition);
         System.out.println(urlAccessInfo);
         try {

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -229,6 +229,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Autowired
     private IOrderInputService orderInputService;
 
+    @Autowired
+    private ISysOldOrgService iSysOldOrgService;
+
     @Value("${oldOrder.studyRecord}")
     private String ORDER_STUDY;
 
@@ -568,6 +571,16 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         add.setStatus(1);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        //运营模式
+        if (ObjectUtils.isNotNull(bo.getTenantId())){
+            SysOldOrg ordOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>()
+                    .eq(SysOldOrg::getOrgId, bo.getTenantId())
+                    .eq(SysOldOrg::getStatus, 1)
+                    .last("LIMIT 1"));
+            if (ObjectUtils.isNotNull(ordOrg)){
+                add.setOperationType(ordOrg.getOperationType());
+            }
+        }
         //佣金计算
         BigDecimal brokerage = new BigDecimal("0.0000");
         if (ObjectUtils.isNotNull(bo.getPretaxBrokerage()) && ObjectUtils.isNotNull(bo.getPretax())) {

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -152,14 +152,16 @@
             AND vto.tenant_id = #{tenantId}
         </if>
         <if test="refundStartTime != null or refundEndTime != null">
-            AND (SELECT COUNT(*)
-            FROM top_old_order_refund tor
+            AND (
+            SELECT COUNT(*)
+            FROM
+             (SELECT order_sn,pay_check_time AS refund_time,`status` FROM top_old_order_refund  UNION ALL SELECT order_sn,refund_time,`status` AS refund_time FROM order_goods_refund ) tor
             WHERE vto.order_sn = tor.order_sn AND tor.`status` = 1
             <if test="refundStartTime != null and refundStartTime != ''">
-                AND tor.pay_check_time &gt;= #{refundStartTime}
+                AND tor.refund_time &gt;= #{refundStartTime}
             </if>
             <if test="refundEndTime != null and refundEndTime != ''">
-                AND tor.pay_check_time &lt;= #{refundEndTime}
+                AND tor.refund_time &lt;= #{refundEndTime}
             </if>
              ) > 0
         </if>
@@ -339,13 +341,13 @@
         </if>
         <if test="refundStartTime != null or refundEndTime != null">
             AND (SELECT COUNT(*)
-            FROM top_old_order_refund tor
+            FROM order_goods_refund tor
             WHERE o.order_sn = tor.order_sn AND tor.`status` = 1
             <if test="refundStartTime != null and refundStartTime != ''">
-                AND tor.pay_check_time &gt;= #{refundStartTime}
+                AND tor.refund_time &gt;= #{refundStartTime}
             </if>
             <if test="refundEndTime != null and refundEndTime != ''">
-                AND tor.pay_check_time &lt;= #{refundEndTime}
+                AND tor.refund_time &lt;= #{refundEndTime}
             </if>
             ) > 0
         </if>
@@ -709,7 +711,7 @@
         FROM
         (
             SELECT
-                SUM( too.order_received - too.order_refunded ) AS money,
+                SUM( too.order_price ) AS money,
                 too.old_customer_id AS customer_id,
                 (
                 SELECT
@@ -799,7 +801,7 @@
         SELECT
             (
             SELECT
-            SUM( too.order_received - too.order_refunded ) AS money
+            SUM( too.order_price ) AS money
             FROM
             top_old_order too
             WHERE
@@ -963,7 +965,7 @@
         SELECT
         ((
         SELECT
-        IFNULL(SUM( too.order_received - too.order_refunded ),0) AS money
+        IFNULL(SUM( too.order_price),0) AS money
         FROM
         top_old_order too
         WHERE
@@ -1164,7 +1166,7 @@
         SELECT
             1 AS orderType,
             COUNT(too.order_id) AS orderNum,
-            SUM( too.order_received - too.order_refunded ) AS money,
+            SUM( too.order_price ) AS money,
             too.old_customer_id AS customer_id,
             (
             SELECT
@@ -1263,7 +1265,7 @@
                     (
                         SELECT
                             tenant_id,
-                            SUM( order_received - order_refunded ) money2
+                            SUM( order_price ) money2
                             <if test="tenantId != null and tenantId != ''">
                                 , create_sys_user_id,any_value(create_username) as create_username
                             </if>
@@ -1339,7 +1341,7 @@
     <select id="getSingleTenantStatistics" parameterType="com.zhongzheng.modules.top.order.bo.TopOrderStatisticsBo"
             resultType="java.math.BigDecimal">
         SELECT
-        (IFNULL(SUM( vo.order_received - vo.order_refunded ),0)+(
+        (IFNULL(SUM( vo.order_price ),0)+(
         SELECT
         IFNULL(SUM(  og.goods_received ),0)
         FROM
@@ -1694,7 +1696,7 @@
             resultType="java.math.BigDecimal">
 
         SELECT
-        IFNULL(SUM( too.order_received - too.order_refunded ),0)+ (
+        IFNULL(SUM( too.order_price ),0)+ (
         SELECT
         IFNULL(SUM(  og.goods_received ),0) AS money
         FROM
@@ -1791,7 +1793,7 @@
             (
                 SELECT
                     ouu.business_name,
-                    IFNULL( SUM( oo.order_received - oo.order_refunded ), 0 ) money
+                    IFNULL( SUM( oo.order_price ), 0 ) money
                 FROM
                     (
                         SELECT
@@ -2062,7 +2064,7 @@
         (
         SELECT
         ouu.business_name,
-        IFNULL( SUM( oo.order_received - oo.order_refunded ), 0 ) money
+        IFNULL( SUM( oo.order_price ), 0 ) money
         FROM
         (
         SELECT
@@ -2167,7 +2169,7 @@
         SELECT
         tenant_id,
         1 AS order_type,
-        SUM( order_received - order_refunded ) money2,
+        SUM( order_price ) money2,
         COUNT( * ) order_num2
         <if test="tenantId != null and tenantId != ''">
             , create_sys_user_id,any_value(create_username) as create_username
@@ -2295,7 +2297,7 @@
         (
         SELECT
         ouu.business_name,
-        IFNULL( SUM( oo.order_received - oo.order_refunded ), 0 ) money,
+        IFNULL( SUM( oo.order_price ), 0 ) money,
         1 AS order_type,
         COUNT( * ) order_num
         FROM