Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SporadicChargeInfoDao.java

@@ -8,4 +8,6 @@ import java.util.List;
 
 public interface SporadicChargeInfoDao extends BaseDAO<Integer, SporadicChargeInfo> {
     SporadicChargeInfo findInfoById(@Param("id") Integer id);
+
+    SporadicChargeInfo findByOrganIdAndType(@Param("organId") Integer organId, @Param("chargeType") Integer chargeType);
 }

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

@@ -27,4 +27,6 @@ public interface SporadicChargeInfoService extends BaseService<Integer, Sporadic
      * @return
      */
     SporadicChargeInfo getDetail(Integer id);
+
+    SporadicChargeInfo findByOrganIdAndType(Integer organId,Integer type);
 }

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

@@ -707,6 +707,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             notifyMap.put("channelType", channelType);
             notifyMap.put("orderNo", "");
             studentPaymentOrderService.updateOrder(notifyMap);
+            notifyMap.put("orderNo", "");
             return notifyMap;
         }
         studentPaymentOrder.setVersion(studentPaymentOrder.getVersion() + 1);

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

@@ -123,4 +123,9 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
 		}
 		return sporadicChargeInfo;
 	}
+
+	@Override
+	public SporadicChargeInfo findByOrganIdAndType(Integer organId, Integer type) {
+		return sporadicChargeInfoDao.findByOrganIdAndType(organId,type);
+	}
 }

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

@@ -112,4 +112,8 @@
 	<select id="findInfoById" resultMap="SporadicChargeInfo">
 		SELECT * FROM sporadic_charge_info where id_ = #{id}
 	</select>
+	<!-- 根据类型和分部id查询活动 -->
+	<select id="findByOrganIdAndType" resultMap="SporadicChargeInfo">
+		SELECT * FROM sporadic_charge_info where organ_id_=#{organId} AND charge_type_=#{chargeType} AND del_flag_=0
+	</select>
 </mapper>

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

@@ -19,6 +19,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.util.Internal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -31,67 +32,87 @@ import java.util.Map;
 @RestController
 public class SporadicChargeInfoController extends BaseController {
 
-	@Autowired
-	private SporadicChargeInfoService sporadicChargeInfoService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-	@Autowired
-	private SysUserCashAccountDao sysUserCashAccountDao;
-	@Autowired
-	private StudentPaymentOrderService studentPaymentOrderService;
-	@Autowired
-	private MusicGroupService musicGroupService;
+    @Autowired
+    private SporadicChargeInfoService sporadicChargeInfoService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private SysUserCashAccountDao sysUserCashAccountDao;
+    @Autowired
+    private StudentPaymentOrderService studentPaymentOrderService;
+    @Autowired
+    private MusicGroupService musicGroupService;
 
-	@ApiOperation(value = "单查询")
-	@GetMapping("/get")
-	public Object get(Integer id,Integer userId) {
-		if(userId == null){
-			SysUser sysUser = sysUserFeignService.queryUserInfo();
-			if (sysUser == null || sysUser.getId() == null) {
-				return failed("用户不存在");
-			}
-			userId = sysUser.getId();
-		}
-		SporadicChargeInfo chargeInfo = sporadicChargeInfoService.get(id);
-		if(chargeInfo != null){
-			SysUserCashAccount locked = sysUserCashAccountDao.getLocked(userId);
-			chargeInfo.setBalance(locked.getBalance());
-		}else {
-			throw new BizException("信息不存在");
-		}
-		return succeed(chargeInfo);
-	}
+    @ApiOperation(value = "单查询")
+    @GetMapping("/get")
+    public Object get(Integer id, Integer userId) {
+        if (userId == null) {
+            SysUser sysUser = sysUserFeignService.queryUserInfo();
+            if (sysUser == null || sysUser.getId() == null) {
+                return failed("用户不存在");
+            }
+            userId = sysUser.getId();
+        }
+        SporadicChargeInfo chargeInfo = sporadicChargeInfoService.get(id);
+        if (chargeInfo != null) {
+            SysUserCashAccount locked = sysUserCashAccountDao.getLocked(userId);
+            chargeInfo.setBalance(locked.getBalance());
+        } else {
+            throw new BizException("信息不存在");
+        }
+        return succeed(chargeInfo);
+    }
 
 
-	@ApiOperation(value = "零星支付")
-	@PostMapping("/sporadicPay")
-	public HttpResponseResult sporadicPay(@RequestBody SporadicPayDto sporadicPayDto) throws Exception {
-		if(sporadicPayDto == null ||
-				sporadicPayDto.getSporadicId() == null ||
-				sporadicPayDto.getAmount() == null){
-			throw new BizException("参数校验失败");
-		}
-		if(sporadicPayDto.getUserId() == null){
-			SysUser sysUser = sysUserFeignService.queryUserInfo();
-			if (sysUser == null || sysUser.getId() == null) {
-				return failed("用户不存在");
-			}
-			if(sysUser.getUserType() != SysUserType.STUDENT){
-				return failed("用户信息异常");
-			}
-			sporadicPayDto.setUserId(sysUser.getId());
-		}
-		if (sporadicPayDto.getIsRepeatPay() == false) {
-			Integer ingOrder = studentPaymentOrderService.findOrderByGroupType(sporadicPayDto.getUserId(),sporadicPayDto.getSporadicId(),"SPORADIC", DealStatusEnum.ING);
-			if (ingOrder != null && ingOrder > 0) {
-				return failed(HttpStatus.CONTINUE, "您有待支付的订单");
-			}
-		}
-		Map payMap = musicGroupService.sporadicPay(sporadicPayDto);
-		if(payMap.containsKey("tradeState")){
-			return failed(HttpStatus.CREATED, "恭喜您,支付成功!");
-		}
-		return succeed(payMap);
-	}
+    @ApiOperation(value = "零星支付")
+    @PostMapping("/sporadicPay")
+    public HttpResponseResult sporadicPay(@RequestBody SporadicPayDto sporadicPayDto) throws Exception {
+        if (sporadicPayDto == null ||
+                sporadicPayDto.getSporadicId() == null ||
+                sporadicPayDto.getAmount() == null) {
+            throw new BizException("参数校验失败");
+        }
+        if (sporadicPayDto.getUserId() == null) {
+            SysUser sysUser = sysUserFeignService.queryUserInfo();
+            if (sysUser == null || sysUser.getId() == null) {
+                return failed("用户不存在");
+            }
+            if (sysUser.getUserType() != SysUserType.STUDENT) {
+                return failed("用户信息异常");
+            }
+            sporadicPayDto.setUserId(sysUser.getId());
+        }
+        if (sporadicPayDto.getIsRepeatPay() == false) {
+            Integer ingOrder = studentPaymentOrderService.findOrderByGroupType(sporadicPayDto.getUserId(), sporadicPayDto.getSporadicId(), "SPORADIC", DealStatusEnum.ING);
+            if (ingOrder != null && ingOrder > 0) {
+                return failed(HttpStatus.CONTINUE, "您有待支付的订单");
+            }
+        }
+        Map payMap = musicGroupService.sporadicPay(sporadicPayDto);
+        if (payMap.containsKey("tradeState")) {
+            return failed(HttpStatus.CREATED, "恭喜您,支付成功!");
+        }
+        return succeed(payMap);
+    }
+
+
+    @ApiOperation(value = "福袋活动信息")
+    @RequestMapping("/activityInfo")
+    public HttpResponseResult activityInfo(Integer type) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null || sysUser.getId() == null) {
+            return failed("请先登录");
+        }
+        if (sysUser.getOrganId() == null || sysUser.getOrganId().isEmpty()) {
+            return failed("用户信息有误，没有分部信息");
+        }
+        Integer organId = Integer.parseInt(sysUser.getOrganId());
+
+        if (type == null || type <= 0) {
+            return failed("参数不合法");
+        }
+        SporadicChargeInfo chargeInfo = sporadicChargeInfoService.findByOrganIdAndType(organId, type);
+        return succeed(chargeInfo);
+    }
 
 }