Selaa lähdekoodia

订单低于1000扣500豆子退回

zhijiezhao 3 vuotta sitten
vanhempi
commit
b075283155

+ 1 - 1
src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -728,7 +728,7 @@ public class CmRefundsProductController extends BaseController {
     /**
      * @return
      * @Author ye.qin
-     * @Description //TODO 审核退货退款申请
+     * @Description //审核退货退款申请
      * @Date 2019\5\29 0029 11:02
      * @Param
      */

+ 20 - 0
src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -626,6 +626,26 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                     userBeans = userBeans - num;
                     cmUserDao.updateUserBeans(newOrder.getUserID(), userBeans);
                 }
+                //订单低于1000扣500豆子退回
+                if (newOrder.getPayTotalFee() != null && newOrder.getPayTotalFee() < 1000) {
+                    //查本单是否扣豆子,有就返回
+                    UserBeansHistory bean = newCmClubDao.findLowOrder(newOrder.getOrderID());
+                    if (bean != null) {
+                        //有扣豆子记录
+                        UserBeansHistory beanHistory = new UserBeansHistory();
+                        beanHistory.setUserId(newOrder.getUserID());
+                        beanHistory.setOrderId(newOrder.getOrderID());
+                        beanHistory.setBeansType(16);
+                        beanHistory.setType(1);
+                        beanHistory.setNum(500);
+                        beanHistory.setPushStatus(0);
+                        beanHistory.setAddTime(new Date());
+                        int beans = user.getUserBeans() + 500;
+                        newCmClubDao.insertBeansHistory(beansHistory);
+                        cmUserDao.updateUserBeans(newOrder.getUserID(), beans);
+                    }
+                }
+
             }
             //优惠券退回
             CmCouponOrderRecord couponOrderRecord = newOrder.getCouponOrderRecord();

+ 3 - 0
src/main/java/com/caimei/modules/user/dao/NewCmClubDao.java

@@ -34,4 +34,7 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
     List<String> getRemarksImageList(Integer remarksId);
 
     List<RemarksFileVo> getRemarksFileList(Integer remarksId);
+
+    UserBeansHistory findLowOrder(Integer orderID);
+
 }

+ 2 - 2
src/main/java/com/caimei/modules/user/entity/UserBeansHistory.java

@@ -21,8 +21,8 @@ public class UserBeansHistory extends DataEntity<UserBeansHistory> {
     private Integer type;
 
     /**
-     * 采美豆类型:1注册机构,2升级会员机构,3普通机构完善资料,4会员机构完善资料,5下单,
-     * 6线上支付订单,7确认收货,8系统发放,9抵用退回,10抵用运费,11退款回收
+     * 1注册机构,2升级会员机构,3普通机构完善资料,4会员机构完善资料,5下单,6线上支付订单,7确认收货,8系统发放,9抵用退回,10抵用运费,
+     * 11退款回收,12登录奖励,13查看商品资料抵扣,14购买超级会员,15系统扣除,16系统退回
      */
     private Integer beansType;
 

+ 9 - 1
src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -641,7 +641,7 @@
 		  and fileType = 2
 	</select>
 
-	<insert id="insertBeansHistory">
+    <insert id="insertBeansHistory">
         INSERT INTO `user_beans_history` (
           `userId`, `type`, `beansType`, `orderId`,
           `num`, `pushStatus`, `addTime`, delFlag
@@ -657,4 +657,12 @@
 		UPDATE club SET status = #{clubStatus} WHERE userID = #{confirmUserId}
 	</update>
 
+	<select id="findLowOrder" resultType="com.caimei.modules.user.entity.UserBeansHistory">
+		select userId, type, beansType, orderId, num, addTime
+		from user_beans_history
+		where orderId = #{orderId}
+		  and delFlag = 0
+		  and type = 2
+		  and num = 500
+	</select>
 </mapper>