bug fixes

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -2184,7 +2184,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
 
     public Map<String, Object> clubCouponList(Integer userId) {
         Map<String, Object> map = new HashMap<>();
-        map.put("success", true);
+        map.put("code", 0);
         List<CmCoupon> couponList = newOrderDao.findClubCouponList(userId);
         couponList.forEach(coupon -> {
             if (coupon.getCouponType() == 0 && "2".equals(coupon.getProductType())) {

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -10,6 +10,7 @@ import com.caimei.modules.bulkpurchase.service.CmFinanceChargeService;
 import com.caimei.modules.bulkpurchase.service.PurchaseProductService;
 import com.caimei.modules.common.utils.ExcelUtil;
 import com.caimei.modules.common.utils.UploadUtils;
+import com.caimei.modules.coupon.entity.CmCouponRedemptionCode;
 import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.*;
@@ -2120,14 +2121,27 @@ public class NewOrderController extends BaseController {
     /**
      * 获取当前机构下所有已领取优惠券
      */
+    @ResponseBody
     @RequestMapping("clubCouponList")
     public Map<String, Object> clubCouponList(Integer userId) {
         Map<String, Object> map = new HashMap<>();
         if (null == userId) {
-            map.put("success", false);
+            map.put("code", -1);
             map.put("msg", "参数异常");
             return map;
         }
         return newOrderService.clubCouponList(userId);
     }
+
+
+    /*@RequestMapping("/redeem")
+    public Map<String, Object> redeemCoupons(CmCouponRedemptionCode redemptionCode) {
+        if (redeemCouponsDto.getUserId() == null || redeemCouponsDto.getSource() == null) {
+            return ResponseJson.error("参数异常", null);
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(redeemCouponsDto.getRedemptionCode())) {
+            return ResponseJson.error("请输入兑换码", null);
+        }
+        return newOrderService.redeemCoupons(redemptionCode);
+    }*/
 }

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -863,23 +863,23 @@
 
 	<select id="findClubCouponList" resultType="com.caimei.modules.coupon.entity.CmCoupon">
 		SELECT
-		  `id`,
-		  `name`,
-		  `couponAmount`,
-		  `touchPrice`,
-		  `startDate`,
-		  `endDate`,
-		  `status`,
-		  `couponType`,
-		  `userId`,
-		  `shopId`,
-		  `productType`,
-		  `pcBanner`,
-		  `appletsBanner`,
-		  `categoryType`,
-		  `couponsMode`,
-		  `createDate`,
-		  `delFlag`,
+		  cc.`id`,
+		  cc.`name`,
+		  cc.`couponAmount`,
+		  cc.`touchPrice`,
+		  cc.`startDate`,
+		  cc.`endDate`,
+		  cc.`status`,
+		  cc.`couponType`,
+		  cc.`userId`,
+		  cc.`shopId`,
+		  cc.`productType`,
+		  cc.`pcBanner`,
+		  cc.`appletsBanner`,
+		  cc.`categoryType`,
+		  cc.`couponsMode`,
+		  cc.`createDate`,
+		  cc.`delFlag`,
 		  a.id AS clubCouponId
 		FROM
 		  cm_coupon_club a
@@ -887,7 +887,7 @@
 		WHERE
 		  cc.delFlag = 0
 		  AND a.delFlag = 0
-		  AND a.userId =
+		  AND a.userId = #{userId}
 		  AND a.status = 1
 		  AND NOW() BETWEEN cc.startDate
 		  AND cc.endDate