update:商城小程序查询订单

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

@@ -163,7 +163,8 @@ public class FsUserCourseCategoryController extends BaseController
             List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList(userId);
             return R.ok().put("data", list);
         }
-        List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList();
+        Integer isShow = null;
+        List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList(isShow);
         return R.ok().put("data", list);
     }
 

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseCategoryMapper.java

@@ -68,8 +68,8 @@ public interface FsUserCourseCategoryMapper
     @Select("select cate_id dict_value, cate_name dict_label,is_del status from fs_store_product_category WHERE pid = 0 and is_del=0 ")
     List<OptionsVO> selectFsUserCoursePidList();
 
-    @Select("select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0 ")
-    List<OptionsVO> selectFsUserCourseCategoryPidList();
+//    @Select("select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0 ")
+    List<OptionsVO> selectFsUserCourseCategoryPidList(@Param("isShow") Integer isShow);
 
     @Select("select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0 and user_id = #{userId}")
     List<OptionsVO> selectFsUserCourseCategoryPidListByUserId(Long userId);

fs-service/src/main/java/com/fs/course/service/IFsUserCourseCategoryService.java

@@ -63,7 +63,7 @@ public interface IFsUserCourseCategoryService
 
     List<OptionsVO> selectFsUserCoursePidList();
 
-    List<OptionsVO> selectFsUserCourseCategoryPidList();
+    List<OptionsVO> selectFsUserCourseCategoryPidList(Integer isShow);
     List<OptionsVO> selectFsUserCourseCategoryPidList(Long userId);
 
     List<OptionsVO> selectCateListByPid(Long pid);

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseCategoryServiceImpl.java

@@ -101,8 +101,8 @@ public class FsUserCourseCategoryServiceImpl implements IFsUserCourseCategorySer
     }
 
     @Override
-    public List<OptionsVO> selectFsUserCourseCategoryPidList() {
-        return fsUserCourseCategoryMapper.selectFsUserCourseCategoryPidList();
+    public List<OptionsVO> selectFsUserCourseCategoryPidList(Integer isShow) {
+        return fsUserCourseCategoryMapper.selectFsUserCourseCategoryPidList(isShow);
     }
 
     @Override

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderItemScrmMapper.java

@@ -145,10 +145,15 @@ public interface FsStoreOrderItemScrmMapper
     List<FsStoreOrderItemExportVO> selectFsStoreOrderItemListExportVO(@Param("maps")FsStoreOrderParam fsStoreOrder);
 
     @Select({"<script> " +
-            "select count(0) from fs_store_order_item_scrm i left join fs_store_order_scrm o on o.id=i.order_id left join fs_user u on o.user_id=u.user_id  " +
-            " left join fs_store_product_package_scrm p on o.package_id=p.package_id left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id left join company_tcm_schedule cts on cts.id = o.schedule_id " +
+            "select count(0) from fs_store_order_item_scrm i " +
+            "left join fs_store_order_scrm o on o.id=i.order_id " +
+            "left join fs_user u on o.user_id=u.user_id  " +
+            " left join fs_store_product_package_scrm p on o.package_id=p.package_id " +
+            "left join company c on c.company_id=o.company_id " +
+            "left join company_user cu on cu.user_id=o.company_user_id " +
+            "left join company_tcm_schedule cts on cts.id = o.schedule_id " +
             "LEFT JOIN fs_store_order_df df on df.order_id=o.id\n" +
-            "        <if test=\"maps.coursePlaySourceConfigId != null\">\n" +
+            "        <if test=\"maps.appId != null and maps.appId != ''\">\n" +
             "            LEFT JOIN (\n" +
             "            SELECT\n" +
             "            sp.*,\n" +
@@ -159,9 +164,9 @@ public interface FsStoreOrderItemScrmMapper
             "            LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id\n" +
             "        </if>" +
             "where 1=1 " +
-            "<if test=\"maps.coursePlaySourceConfigId != null\">\n" +
-            "                and csc.id = #{maps.coursePlaySourceConfigId}\n" +
-            "            </if>\n" +
+            "<if test=\"maps.appId != null and maps.appId != ''\">\n" +
+            "   and csc.appid = #{maps.appId}\n" +
+            " </if>\n" +
             "            <if test=\"maps.orderCodes != null  and maps.orderCodes.size > 0\">\n" +
             "                and o.order_code in\n" +
             "                <foreach collection=\"maps.orderCodes\" item=\"orderCode\" open=\"(\" close=\")\" separator=\",\">\n" +

fs-service/src/main/java/com/fs/hisStore/mapper/FsStorePaymentScrmMapper.java

@@ -74,7 +74,15 @@ public interface FsStorePaymentScrmMapper
     FsStorePaymentScrm selectFsStorePaymentByCode(String payCode);
 
     @Select({"<script> " +
-            "select p.*,o.order_code,c.company_name,d.dept_name,u.phone as user_phone,cu.nick_name as company_user_nick_name,cu.user_name as company_user_name  from fs_store_payment_scrm p left join company_user cu on p.company_user_id=cu.user_id left join fs_user u on u.user_id=p.user_id left join company_dept d on d.dept_id=p.dept_id left join company c on c.company_id=p.company_id left join fs_store_order_scrm o on o.id=p.order_id   " +
+            "select p.*,o.order_code,c.company_name,d.dept_name,u.phone as user_phone," +
+            "cu.nick_name as company_user_nick_name,cu.user_name as company_user_name ,csc.name miniProgramName " +
+            "from fs_store_payment_scrm p " +
+            "left join company_user cu on p.company_user_id=cu.user_id " +
+            "left join fs_user u on u.user_id=p.user_id " +
+            "left join company_dept d on d.dept_id=p.dept_id " +
+            "left join company c on c.company_id=p.company_id " +
+            "left join fs_store_order_scrm o on o.id=p.order_id   " +
+            "LEFT JOIN fs_course_play_source_config csc ON csc.appid = p.app_id " +
             "where 1=1 " +
             "<if test = 'maps.payCode != null and  maps.payCode !=\"\"    '> " +
             "and p.pay_code like CONCAT('%',#{maps.payCode},'%') " +
@@ -131,6 +139,7 @@ public interface FsStorePaymentScrmMapper
             " AND date_format(p.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d') " +
             " AND date_format(p.create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d') " +
             "</if>" +
+            "<if test=\"maps.appId != null and maps.appId != ''\">  and p.app_id like #{maps.appId}</if>\n" +
 
 //            "<if test = 'maps.refundTime != null    '> " +
 //            "and DATE_FORMAT(p.refund_time,'%Y-%m-%d') = DATE_FORMAT(#{maps.refundTime},'%Y-%m-%d')  " +
@@ -143,8 +152,15 @@ public interface FsStorePaymentScrmMapper
 
     @Select({"<script> " +
             "select p.*,o.order_code,fsp.title, c.company_name,u.phone as user_phone,cu.nick_name as company_user_nick_name,cu.user_name as company_user_name " +
-            ",(select group_concat(dd.dept_name separator  '>') from company_dept dd where p.dept_id=dd.dept_id or find_in_set(dd.dept_id,d.ancestors)) as dept_name "+
-            " from fs_store_payment_scrm p left join company_user cu on p.company_user_id=cu.user_id left join fs_user u on u.user_id=p.user_id left join company_dept d on d.dept_id=p.dept_id left join company c on c.company_id=p.company_id left join fs_store_order_scrm o on o.id=p.order_id left join fs_store_product_package_scrm fsp on o.package_id = fsp.package_id " +
+            ",(select group_concat(dd.dept_name separator  '>') from company_dept dd where p.dept_id=dd.dept_id or find_in_set(dd.dept_id,d.ancestors)) as dept_name ,csc.name miniProgramName "+
+            " from fs_store_payment_scrm p " +
+            "left join company_user cu on p.company_user_id=cu.user_id " +
+            "left join fs_user u on u.user_id=p.user_id " +
+            "left join company_dept d on d.dept_id=p.dept_id " +
+            "left join company c on c.company_id=p.company_id " +
+            "left join fs_store_order_scrm o on o.id=p.order_id " +
+            "left join fs_store_product_package_scrm fsp on o.package_id = fsp.package_id " +
+            "LEFT JOIN fs_course_play_source_config csc ON csc.appid = p.app_id " +
             "where 1=1 " +
             "<if test = 'maps.payCode != null and  maps.payCode !=\"\"    '> " +
             "and p.pay_code like CONCAT('%',#{maps.payCode},'%') " +
@@ -186,6 +202,7 @@ public interface FsStorePaymentScrmMapper
             " AND date_format(p.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d') " +
             " AND date_format(p.create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d') " +
             "</if>" +
+            "<if test=\"maps.appId != null and maps.appId != ''\">  and p.app_id like #{maps.appId}</if>\n" +
             " ${maps.params.dataScope} "+
             " order by p.payment_id desc limit 30000  "+
             "</script>"})

fs-service/src/main/java/com/fs/hisStore/param/FsStoreOrderParam.java

@@ -111,4 +111,6 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable
     //导出字段
     private String filter;
 
+    private String appId;
+
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStorePaymentParam.java

@@ -46,4 +46,8 @@ public class FsStorePaymentParam  extends BaseEntity implements Serializable
     private String createTimeRange;
 
     private String[] createTimeList;
+
+    // 小程序ID
+    private Long coursePlaySourceConfigId;
+    private String appId;
 }

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

@@ -3991,6 +3991,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                         mt.setPaymentId(storePayment.getPaymentId());
                         mt.setTradeNo(result.getHf_seq_id());
                         mt.setAppId(param.getAppId());
+                        mt.setBusinessCode(order.getOrderCode());
                         fsStorePaymentMapper.updateFsStorePayment(mt);
                         redisCache.setCacheObject("isPaying:"+order.getId(),order.getId().toString(),1, TimeUnit.MINUTES);
                         Map<String, Object> resultMap = JSON.parseObject(result.getPay_info(), new TypeReference<Map<String, Object>>() {});

fs-service/src/main/java/com/fs/hisStore/vo/FsStorePaymentVO.java

@@ -90,6 +90,10 @@ public class FsStorePaymentVO implements Serializable
 
     private String payMode;
 
+    // 小程序名称
+    @Excel(name = "所属小程序")
+    private String miniProgramName;
+
 
 
 }

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

@@ -36,6 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFsUserCourseCategoryVo"/>
         where cate_id = #{cateId}
     </select>
+    <select id="selectFsUserCourseCategoryPidList" resultType="com.fs.his.vo.OptionsVO">
+        select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0
+        <if test="isShow != null">
+            and is_show = #{isShow}
+        </if>
+    </select>
 
     <insert id="insertFsUserCourseCategory" parameterType="FsUserCourseCategory" useGeneratedKeys="true" keyProperty="cateId">
         insert into fs_user_course_category

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1003,8 +1003,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1
         LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1159,7 +1159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="maps.erpAccount != null and  maps.erpAccount != ''">
             LEFT JOIN fs_store_order_df df on df.order_id==o.id
         </if>
-        <if test="maps.coursePlaySourceConfigId != null">
+        <if test="maps.appId != null and maps.appId != ''">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1169,8 +1169,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         </if>
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1301,7 +1301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join fs_store_order_item_scrm oi on o.id = oi.order_id
             left join fs_store_product_scrm fsp on fsp.product_id = oi.product_id
         </if>
-        <if test="maps.coursePlaySourceConfigId != null">
+        <if test="maps.appId != null and maps.appId != ''">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1312,8 +1312,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         </if>
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1424,6 +1424,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maps.erpAccount == '未分拣'">
                 and ( df.login_account is null or df.login_account like '')
             </if>
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
+            </if>
 
         </where>
         ${maps.params.dataScope}
@@ -1442,7 +1445,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN fs_user us ON us.user_id=o.user_id
         LEFT JOIN company_user cu on cu.user_id=o.company_user_id
         LEFT JOIN fs_store_order_df df on df.order_id=o.id
-        <if test="maps.coursePlaySourceConfigId != null">
+        <if test="maps.appId != null and maps.appId != ''">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1453,8 +1456,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         </if>
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1593,8 +1596,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1
         LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1742,7 +1745,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join fs_store_order_item_scrm oi on o.id = oi.order_id
             left join fs_store_product_scrm fsp on fsp.product_id = oi.product_id
         </if>
-        <if test="maps.coursePlaySourceConfigId != null">
+        <if test="maps.appId != null and maps.appId != ''">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1754,8 +1757,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
 
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and map.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCode != null and  maps.orderCode !=''">
                 and o.order_code like CONCAT('%',#{maps.orderCode},'%')
@@ -1852,6 +1855,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maps.erpPhoneNumber != null and maps.erpPhoneNumber != ''">
                 and so.erp_phone like concat(#{maps.erpPhoneNumber},'%')
             </if>
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
+            </if>
         </where>
         ${maps.params.dataScope}
         <if test="maps.productName != null and  maps.productName !=  ''   ">

fs-service/src/main/resources/mapper/hisStore/FsStorePaymentScrmMapper.xml

@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderId"    column="order_id"    />
         <result property="isPayRemain"    column="is_pay_remain"    />
         <result property="payMode"    column="pay_mode"    />
+        <result property="businessCode"    column="business_code"    />
     </resultMap>
 
     <sql id="selectFsStorePaymentVo">
-        select payment_id,pay_mode, pay_code, pay_type_code, pay_money, pay_time, create_time, trade_no, user_id, open_id, business_type, business_order_id, status,remark,company_id,company_user_id,dept_id,bank_transaction_id,bank_serial_no,refund_money,refund_time,order_id,is_pay_remain from fs_store_payment_scrm
+        select payment_id,pay_mode, pay_code, pay_type_code, pay_money, pay_time, create_time, trade_no, user_id, open_id, business_type, business_order_id, status,remark,company_id,company_user_id,dept_id,bank_transaction_id,bank_serial_no,refund_money,refund_time,order_id,is_pay_remain,business_code from fs_store_payment_scrm
 
     </sql>
 
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bankTransactionId != null "> and bank_transaction_id = #{bankTransactionId}</if>
             <if test="bankSerialNo != null "> and bank_serial_no = #{bankSerialNo}</if>
             <if test="orderId != null "> and order_id = #{orderId}</if>
+            <if test="businessCode != null and businessCode != ''"> and business_code = #{businessCode}</if>
         </where>
     </select>
 
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPayRemain != null">is_pay_remain,</if>
             <if test="payMode != null">pay_mode,</if>
             <if test="appId != null">app_id,</if>
+            <if test="businessCode != null">business_code,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="payCode != null">#{payCode},</if>
@@ -114,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPayRemain != null">#{isPayRemain},</if>
             <if test="payMode != null">#{payMode},</if>
             <if test="appId != null">#{appId},</if>
+            <if test="businessCode != null">#{businessCode},</if>
         </trim>
     </insert>
 
@@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPayRemain != null">is_pay_remain = #{isPayRemain},</if>
             <if test="payMode != null">pay_mode = #{payMode},</if>
             <if test="appId != null">app_id = #{appId},</if>
+            <if test="businessCode != null and businessCode != ''">business_code = #{businessCode},</if>
         </trim>
         where payment_id = #{paymentId}
     </update>

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

@@ -54,9 +54,9 @@ public class CourseController extends  AppBaseController{
 //    @Cacheable(value="getCourseCate" )
     @ApiOperation("获取分类")
     @GetMapping("/getCourseCate")
-    public R getCourseCate(){
+    public R getCourseCate(@RequestParam(value = "isShow",required = false) Integer isShow){
         try {
-            List<OptionsVO> list = courseCategoryService.selectFsUserCourseCategoryPidList();
+            List<OptionsVO> list = courseCategoryService.selectFsUserCourseCategoryPidList(isShow);
             return R.ok().put("data",list);
         } catch (Exception e){
             return R.error("操作异常");

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

@@ -89,7 +89,8 @@ public class CourseScrmController extends AppBaseController {
     @GetMapping("/getCourseCate")
     public R getCourseCate(){
         try {
-            List<OptionsVO> list = courseCategoryService.selectFsUserCourseCategoryPidList();
+            Integer isShow = null;
+            List<OptionsVO> list = courseCategoryService.selectFsUserCourseCategoryPidList(isShow);
             return R.ok().put("data",list);
         } catch (Exception e){
             return R.error("操作异常");

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

@@ -267,7 +267,11 @@ public class WxUserScrmController extends AppBaseController {
         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");
+            try {
+                courseMa_appId = configUtil.generateConfigMiniByKey(SysConfigEnum.COURSE_MA_CONFIG.getKey(),param.getAppId()).getString("appid");
+            } catch (Exception e) {
+                courseMa_appId = param.getAppId();
+            }
         }else{
             courseMa_appId = configUtil.generateConfigByKey(SysConfigEnum.COURSE_MA_CONFIG.getKey()).getString("appid");
         }