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

mec-biz/src/main/java/com/ym/mec/biz/service/SysCouponIssueRecordService.java

@@ -21,6 +21,7 @@ public interface SysCouponIssueRecordService extends IService<SysCouponIssueReco
     int revokeCoupon(Integer couponId);
 
     PageInfo<?> queryIssueDetail(Map<String, Object> param);
+
     PageInfo<CouponIssueRecordVo> queryIssueRecord(Map<String, Object> param);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysCouponIssueRecordServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.Optional;
 @Service("sysCouponIssueRecordService")
 public class SysCouponIssueRecordServiceImpl extends ServiceImpl<SysCouponIssueRecordDao, SysCouponIssueRecord> implements SysCouponIssueRecordService {
 
-    private final static Logger logger = LoggerFactory.getLogger(SysCouponIssueRecordServiceImpl.class);
+    private final static Logger log = LoggerFactory.getLogger(SysCouponIssueRecordServiceImpl.class);
 
     @Autowired
     private SysCouponCodeService sysCouponCodeService;
@@ -65,7 +65,7 @@ public class SysCouponIssueRecordServiceImpl extends ServiceImpl<SysCouponIssueR
                 .map(String::valueOf)
                 .map(Integer::parseInt)
                 .map(sysCouponService::get)
-                .filter(c -> c.getStatus() == 1)
+                .filter(c -> c.getStatus() == 1 && c.getIssuanceType() == 1)
                 .orElseThrow(() -> new BizException("查询不到优惠券!"));
 
         Integer tenantId = TenantContextHolder.getTenantId();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreCategoriesServiceImpl.java

@@ -41,6 +41,11 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
 		for (SysMusicScoreCategories categories : scoreCategories) {
 			categories = getTree(categories,scoreCategoriesAllList);
+			if (categories.getSysMusicScoreCategoriesList() != null) {
+				categories.setMusicScoreNum(categories.getSysMusicScoreCategoriesList().size());
+			} else {
+				categories.setMusicScoreNum(0);
+			}
 		}
 		return scoreCategories;
 	}
@@ -202,8 +207,13 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 			//将子节点list放入父节点对象
 			categories.setSysMusicScoreCategoriesList(scoreCategories);
 			//遍历子节点....
-			for (SysMusicScoreCategories sysMenu : scoreCategories) {
-				getTree(sysMenu,scoreCategoriesAllList);
+			for (SysMusicScoreCategories score : scoreCategories) {
+				getTree(score, scoreCategoriesAllList);
+				if (score.getSysMusicScoreCategoriesList() != null) {
+					score.setMusicScoreNum(score.getSysMusicScoreCategoriesList().size());
+				} else {
+					score.setMusicScoreNum(0);
+				}
 			}
 		}
 		return categories;

mec-biz/src/main/resources/config/mybatis/StudentInstrumentMapper.xml

@@ -159,8 +159,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentInstrument">
-        SELECT *
-        FROM student where tenant_id_ = #{tenantId}
+        SELECT * FROM student where tenant_id_ = #{tenantId}
     </select>
 
     <!-- 分页查询 -->
@@ -182,7 +181,7 @@
 
     <sql id="queryPageSql">
         <where>
-        	tenant_id_ = #{tenantId}
+        	si.tenant_id_ = #{tenantId}
             <if test="studentId != null">
                 AND si.student_id_ = #{studentId}
             </if>

mec-biz/src/main/resources/config/mybatis/SysCouponIssueRecordMapper.xml

@@ -62,7 +62,7 @@
         a.coupon_name_ as couponName,
         a.num_ as num,
         u.real_name_ as `name`,
-        a.ops
+        a.ops_ as ops
         from sys_coupon_issue_record as a
         left join sys_user as u on a.created_by_ = u.id_
         where a.tenant_id_ = #{param.tenantId}

mec-student/src/main/java/com/ym/mec/student/controller/SysCouponCodeController.java

@@ -11,10 +11,9 @@ import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RequestMapping("sysCouponCode")
 @Api(tags = "优惠券明细")
@@ -58,32 +57,4 @@ public class SysCouponCodeController extends BaseController {
         return succeed(sysCouponCodeService.exchangeCouponTest(sysUser.getId(), couponId, paymentOrderId, exchangeNum));
     }
 
-    /**
-     * 手动发放优惠券
-     */
-    @ApiOperation("手动发放优惠券")
-    @PostMapping(value = "/issueCoupon")
-    public HttpResponseResult issueCoupon(@RequestBody Map<String, Object> param) {
-        couponIssueRecordService.issueCoupon(param);
-        return succeed();
-    }
-
-    @ApiOperation("撤销发放优惠券")
-    @PostMapping(value = "/revokeCoupon")
-    public HttpResponseResult revokeCoupon(Integer couponId) {
-        return succeed(couponIssueRecordService.revokeCoupon(couponId));
-    }
-
-    @ApiOperation("查询优惠券发放名单")
-    @PostMapping(value = "/queryIssueDetail")
-    public HttpResponseResult queryIssueDetail(@RequestBody Map<String, Object> param) {
-        return succeed(couponIssueRecordService.queryIssueDetail(param));
-    }
-
-    @ApiOperation("查询优惠券发放名单")
-    @PostMapping(value = "/queryIssueRecord")
-    public HttpResponseResult queryIssueRecord(@RequestBody Map<String, Object> param) {
-        return succeed(couponIssueRecordService.queryIssueRecord(param));
-    }
-
 }

mec-web/src/main/java/com/ym/mec/web/controller/SysCouponIssueRecordController.java

@@ -0,0 +1,60 @@
+package com.ym.mec.web.controller;
+
+
+import com.ym.mec.biz.service.SysCouponIssueRecordService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 优惠券发放记录(SysCouponIssueRecord)表控制层
+ *
+ * @author hgw
+ * @since 2021-12-30 16:48:15
+ */
+@RestController
+@RequestMapping("/sysCouponIssue")
+public class SysCouponIssueRecordController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private SysCouponIssueRecordService couponIssueRecordService;
+
+    /**
+     * 手动发放优惠券
+     */
+    @ApiOperation("手动发放优惠券")
+    @PostMapping(value = "/issueCoupon")
+    public HttpResponseResult issueCoupon(@RequestBody Map<String, Object> param) {
+        couponIssueRecordService.issueCoupon(param);
+        return succeed();
+    }
+
+    @ApiOperation("撤销发放优惠券")
+    @PostMapping(value = "/revokeCoupon")
+    public HttpResponseResult revokeCoupon(Integer couponId) {
+        return succeed(couponIssueRecordService.revokeCoupon(couponId));
+    }
+
+    @ApiOperation("查询优惠券发放名单")
+    @PostMapping(value = "/queryIssueDetail")
+    public HttpResponseResult queryIssueDetail(@RequestBody Map<String, Object> param) {
+        return succeed(couponIssueRecordService.queryIssueDetail(param));
+    }
+
+    @ApiOperation("查询优惠券发放记录")
+    @PostMapping(value = "/queryIssueRecord")
+    public HttpResponseResult queryIssueRecord(@RequestBody Map<String, Object> param) {
+        return succeed(couponIssueRecordService.queryIssueRecord(param));
+    }
+
+}
+