Merge branch 'master' into pre

netflix-dao/src/main/java/com/cyksj/model/entity/UpgradeOrderDon.java

@@ -24,6 +24,8 @@ public class UpgradeOrderDon extends BaseEntity {
      */
     private Long goodsId;
 
+    private Long skuId;
+
     /**
      * 套餐id
      */

netflix-dao/src/main/java/com/cyksj/model/manage/views/UpgradeOrderDonBackView.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Setter
 @SearchBean(tables = "upgrade_order_don o left join upgrade_package up on o.package_id = up.id " +
 		"left join goods_don g on up.goods_id = g.id " +
-		"left join goods_don_sku gds on up.sku_id = gds.id ",
+		"left join goods_don_sku gds on o.sku_id = gds.id ",
 		where = ":condition:"
 )
 public class UpgradeOrderDonBackView {

netflix-dao/src/main/java/com/cyksj/model/manage/views/UpgradeOrderDonSearchView.java

@@ -26,7 +26,7 @@ import java.util.List;
 @Setter
 @SearchBean(tables = "(select * from upgrade_order_don :orderId:) o left join upgrade_package up on o.package_id = up.id " +
 		"left join goods_don g on g.id = up.goods_id " +
-		"left join goods_don_sku gs on gs.id = up.sku_id ")
+		"left join goods_don_sku gs on gs.id = o.sku_id ")
 public class UpgradeOrderDonSearchView {
 	@DbField("o.id")
 	private Long id;

netflix-dao/src/main/java/com/cyksj/model/manage/views/UpgradeOrderDonView.java

@@ -24,7 +24,7 @@ import java.util.List;
 @Setter
 @SearchBean(tables = "upgrade_order_don o left join upgrade_package up on o.package_id = up.id " +
         "left join goods_don g on g.id = o.goods_id " +
-        "left join goods_don_sku sku on up.sku_id = sku.id ")
+        "left join goods_don_sku sku on o.sku_id = sku.id ")
 public class UpgradeOrderDonView {
 
     @DbField("o.id")

netflix-dao/src/main/java/com/cyksj/model/views/RefundUpdradeOrderDonView.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "refund_upgrade_order_don rd left join upgrade_order_don o on o.id = rd.order_id " +
-		"left join upgrade_package up on up.id = o.package_id left join goods_don_sku s on s.id = up.sku_id")
+		"left join upgrade_package up on up.id = o.package_id left join goods_don_sku s on s.id = o.sku_id")
 public class RefundUpdradeOrderDonView {
 	@DbField("rd.id")
 	private Long id;

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsYhShopCommonServiceImpl.java

@@ -12,6 +12,7 @@ import com.cyksj.mapper.shop.*;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.request.DistributeApplyMoneyReq;
 import com.cyksj.model.request.YhShopVerifyReq;
+import com.cyksj.redis.RedisService;
 import com.cyksj.service.mange.CmsYhShopCommonService;
 import com.cyksj.service.mange.business.UserBusinessRateService;
 import com.cyksj.service.shop.YhShopUserPlatDistributeRateService;
@@ -55,6 +56,8 @@ public class CmsYhShopCommonServiceImpl implements CmsYhShopCommonService {
 
 	private final YhShopUserPlatDistributeRateMapper yhShopUserPlatDistributeRateMapper;
 
+	private final RedisService redisService;
+
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
 	public void verifyYhShopApply(YhShopVerifyReq verifyReq) {
@@ -106,6 +109,12 @@ public class CmsYhShopCommonServiceImpl implements CmsYhShopCommonService {
 		yhShopApplyRecord.setVerifyStatus(verifyStatus);
 		yhShopApplyRecordMapper.updateById(yhShopApplyRecord);
 		yhShopMapper.updateById(yhShop);
+
+		if (yhShopApplyRecord.getVerifyStatus() == YhShopApplyRecord.Status.fail) {
+			String type = "shop";
+			String key = String.format(RedisService.key.APPLY_MONEY_DAY_LIMIT_KEY.getName(), DateTime.now().toDateStr(), type, yhShopApplyRecord.getUserId());
+			redisService.del(key);
+		}
 	}
 
 	@Override

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -3216,6 +3216,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			upgradeOrderDon.setPrice(upgradePackage.getPrice());
 			upgradeOrderDon.setNum(upgradePackage.getNum());
 			upgradeOrderDon.setGoodsId(goodsDonSku.getGoodsId());
+			upgradeOrderDon.setSkuId(goodsDonSku.getId());
 			upgradeOrderDon.setMoney(payRequest.getDonMoney());
 			upgradeOrderDon.setStatus(UpgradeOrderDon.Status.noPayment);
 			upgradeOrderDon.setType(UpgradeOrderDon.Type.ALI_PAY);

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -479,6 +479,11 @@ public class DistributeController {
 			distributeMoneyApply.setImg(distributeApplyMoneyReq.getImg());
 		}
 		distributeMoneyApplyMapper.updateById(distributeMoneyApply);
+
+		if (distributeMoneyApply.getVerifyStatus() == DistributeMoneyApply.Status.fail) {
+			String key = String.format(RedisService.key.APPLY_MONEY_DAY_LIMIT_KEY.getName(), DateTime.now().toDateStr(), DistributeMoneyApply.MType.ds.name(), distributeMoneyApply.getUserId());
+			redisService.del(key);
+		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult("审核操作成功");
 	}