fix:库存

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponIssueVo.java

@@ -21,6 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -606,6 +607,11 @@ public class CouponIssueVo {
         @ApiModelProperty("备注")
         private String remark;
 
+        public BigDecimal couponAmount;
+
+        public BigDecimal actualPrice;
+
+        public BigDecimal expectPrice;
 
         @ApiModelProperty("使用类型")
         private CouponCategoryEnum useType;

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

@@ -532,7 +532,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
         }
 
-        if (musicSheetDto.getId() != null && musicSheetDto.getSourceType().equals(SourceTypeEnum.PLATFORM)) {
+        if (musicSheetDto.getId() != null && musicSheetDto.getSourceType().equals(SourceTypeEnum.PLATFORM)
+                || oldMusicSheet != null && oldMusicSheet.getAuditStatus().equals(AuthStatusEnum.DOING) && musicSheetDto.getSourceType().equals(SourceTypeEnum.TEACHER)) {
             musicSheetAccompanimentService.delByMusicSheetId(musicSheetDto.getId());
         }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponInfoMapper.xml

@@ -168,6 +168,9 @@
                 where inventory_ - #{size} >= 0
             </when>
         </choose>
+        <where>
+            id_ = #{couponId}
+        </where>
     </update>