Merge remote-tracking branch 'origin/master'

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/PhoneAuthenticationProvider.java

@@ -52,7 +52,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 		String phone = loginEntity.getPhone();
 
 		// 验证码验证
-		boolean b = smsCodeService.verifyValidCode(phone, smsCode);
+		boolean b = smsCodeService.verifyValidCode(phone, smsCode,"SMS_VERIFY_CODE_LOGIN");
 		if (!b) {
 			throw new BadCredentialsException("验证码校验失败");
 		}

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -213,7 +213,7 @@ public class UserController extends BaseController {
         if (sysUser == null) {
             return failed("用户不存在");
         }
-        if (smsCodeService.verifyValidCode(mobile, authCode)) {
+        if (smsCodeService.verifyValidCode(mobile, authCode,"SMS_VERIFY_CODE_UPDATE_PSW")) {
             String password = new BCryptPasswordEncoder().encode(newPassword);
             sysUser.setPassword(password);
             sysUser.setUpdateTime(new Date());
@@ -261,7 +261,7 @@ public class UserController extends BaseController {
         if (newSysUser != null) {
             return failed("手机号被占用");
         }
-        if (smsCodeService.verifyValidCode(newPhone, authCode)) {
+        if (smsCodeService.verifyValidCode(newPhone, authCode,"SMS_VERIFY_CODE_UPDATE_PHONE")) {
             sysUser.setPhone(newPhone);
             sysUser.setUpdateTime(new Date());
             sysUserService.update(sysUser);

cooleshow-common/src/main/java/com/yonge/cooleshow/common/service/IdGeneratorService.java

@@ -21,5 +21,5 @@ public interface IdGeneratorService {
 	 * @param authCode
 	 * @return
 	 */
-	boolean verifyValidCode(String mobile, String authCode);
+	boolean verifyValidCode(String mobile, String authCode,String keyEnum);
 }

cooleshow-common/src/main/java/com/yonge/cooleshow/common/service/impl/RedisIdGeneratorService.java

@@ -94,13 +94,13 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 	}
 
 	@Override
-	public boolean verifyValidCode(String mobile, String authCode) {
+	public boolean verifyValidCode(String mobile, String authCode,String keyEnum) {
 		if (debugMode) {
 			if (defaultPwd.equals(authCode)) {
 				return true;
 			}
 		} else {
-			String key = "verificationCodeSMS_VERIFY_CODE_LOGIN" + mobile;
+			String key = "verificationCode" + keyEnum + mobile;
 			Object object = redisCache.get(key);
 			log.info("*********************mobile:{} smsCode:{} inutCode:{}******************", key, object, authCode);
 			String verifyCode = object == null ? null : object.toString();

cooleshow-mall/mall-admin/src/main/resources/config/mybatis/PmsProductDao.xml

@@ -79,6 +79,7 @@
         </if>
 
         <where>
+            pp.delete_status = 0
             <if test="param.publishStatus != null">
                 and pp.publish_status = #{param.publishStatus}
             </if>

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PaymentController.java

@@ -1,8 +1,5 @@
 package com.yonge.cooleshow.portal.controller;
 
-import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
-import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
-import com.github.binarywang.wxpay.service.WxPayService;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -25,8 +22,6 @@ import com.yonge.toolset.payment.base.model.Payment;
 import com.yonge.toolset.payment.base.model.callback.PaymentCallBack;
 import com.yonge.toolset.payment.core.props.PaymentProperties;
 import com.yonge.toolset.payment.core.service.PaymentClient;
-import com.yonge.toolset.payment.core.service.SysConfigPaymentService;
-import com.yonge.toolset.payment.original.wx.constant.WxpayConstant;
 import com.yonge.toolset.utils.web.WebUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,10 +54,6 @@ public class PaymentController extends BaseController {
     private PaymentClient paymentClient;
     @Autowired
     private PaymentProperties paymentProperties;
-    @Autowired
-    private SysConfigPaymentService configPaymentService;
-    @Autowired
-    private WxPayService wxPayService;
 
     @Autowired
     private OmsPortalOrderService orderService;
@@ -170,25 +161,4 @@ public class PaymentController extends BaseController {
         return res.getData().getResMsg();
     }
 
-
-    // private Object wxAppCallbackHandle(String payMethod, HttpServletRequest request) throws Exception {
-    //     String merchantId = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_MERCHANT_ID).getParamValue();
-    //     String apiV3Key = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_API_V3_KEY).getParamValue();
-    //
-    //     //支付回调
-    //     if ("executePayment".equals(payMethod)) {
-    //         SignatureHeader header = new SignatureHeader();
-    //         header.setTimeStamp(request.getHeader("Wechatpay-Timestamp"));
-    //         header.setNonce(request.getHeader("Wechatpay-Nonce"));
-    //         header.setSerial(request.getHeader("Wechatpay-Serial"));
-    //         header.setSignature(request.getHeader("Wechatpay-Signature"));
-    //
-    //         String params = WebUtil.getBodyData(request);
-    //
-    //         WxPayOrderNotifyV3Result wxPayOrderNotifyV3Result = wxPayService.parseOrderNotifyV3Result(params, header);
-    //
-    //     }
-    //     return null;
-    // }
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -596,6 +596,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         dataList.sort(Comparator.comparingInt(ExcelDataReaderProperty::getRowIndex));
         List<MusicSheetDto> musicSheetDtoList = new ArrayList<>();
         List<MusicTagVo> musicTagVoList = musicTagService.selectMusicTagTree();
+        List<Subject> subjects = subjectService.subjectSelect();
 
         for (ExcelDataReaderProperty<MusicSheetExport> readerProperty : dataList) {
             MusicSheetDto musicSheetDto = new MusicSheetDto();
@@ -610,6 +611,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             musicSheetDto.setUpdateBy(userId);
             musicSheetDto.setCreateTime(new Date());
             musicSheetDto.setUpdateTime(new Date());
+            if(AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())) {
+                musicSheetDto.setMp3Type(null);
+            }
             String errMsg = readerProperty.getErrorMessage();
             if (!StringUtil.isEmpty(errMsg)) {
                 errMsgList.add(new ErrMsg(readerProperty.getRowIndex(), errMsg));
@@ -623,7 +627,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
                 musicSheetDto.setMidiUrl("");
             }
 
-            // TODO 导入
             String musicTags = sheetExport.getMusicTags();
             StringBuilder musicTagIds = new StringBuilder();
             if (musicTags == null || musicTags.equals("")) {
@@ -656,7 +659,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             if (StringUtil.isEmpty(sheetExport.getMusicSubjects())) {
                 errMsgList.add(new ErrMsg(readerProperty.getRowIndex(), "曲目声部不能为空"));
             } else {
-                List<Subject> subjects = subjectService.subjectSelect();
                 List<Subject> childrenSubject = new ArrayList<>();
                 for (Subject subject : subjects) {
                     if (CollectionUtils.isEmpty(subject.getSubjects())) {