12/25

src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftDto.java

@@ -39,4 +39,5 @@ public class EmpCardGiftDto implements Dto {
     private String isItlnvalid;
     private String iReservation;
     private List<GoodsVo> goodsVoList;
+    private String count;
 }

src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoods.java

@@ -24,4 +24,5 @@ public class LpkGiftBagGoods {
     private String giftbagSid;
     private String goodsSid;
     private String goodsNumber;
+    private String isGrounding;
 }

src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java

@@ -34,4 +34,5 @@ public interface EmpCardMapper extends BaseMapper<EmpCard> {
 
     IPage<EmpAppletVo> getEmpCardByCustomerSid(IPage<EmpCard> page, @Param(Constants.WRAPPER) QueryWrapper<EmpCard> qw);
     List<EmpCardVo> selEmpCardSid(@Param("empCardSid")String empCardSid);
+    EmpCardVo getBagGoods(@Param("sid")String sid  ,@Param("goodsSid")String goodsSid);
 }

src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml

@@ -121,11 +121,21 @@
     </select>
     <select id="selEmpCardSid" resultType="com.yxt.yyth.api.empcard.EmpCardVo">
         SELECT card.*,
-               s.name as goodsNmae,
+               s.name as goodsName,
                s.sid  as goodsSid
         FROM emp_card card
                  LEFT JOIN lpk_giftbag bag on card.giftbagSid = bag.sid
                  left join lpk_giftbag_goods s on card.sid = s.giftbagSid
         where card.sid = #{empCardSid}
     </select>
+    <select id="getBagGoods" resultType="com.yxt.yyth.api.empcard.EmpCardVo">
+        SELECT card.*,
+               s.sid  as goodsSid,
+               s.goodsNumber as goodsNumber
+        FROM emp_card card
+                 LEFT JOIN lpk_giftbag bag on card.giftbagSid = bag.sid
+                 left join lpk_giftbag_goods s on bag.sid = s.giftbagSid
+        where card.sid = #{sid} and  s.goodsSid=#{goodsSid}
+    </select>
+
 </mapper>

src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java

@@ -220,7 +220,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
         if (StringUtils.isNotBlank(query.getNumber())) {
             qw.like("serialNumber", query.getNumber());
         }
-//        qw.eq("recordSid", query.getSid());
+        qw.eq("recordSid", query.getSid());
         //得到所有要导出的数据
         List<EmpCardExport> exportList = baseMapper.exportExcel(qw);
         if (!exportList.isEmpty()) {
@@ -344,4 +344,9 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
         baseMapper.updateById(card);
         return rb.success().setData("成功");
     }
+    public ResultBean<EmpCardVo> getBagGoods(String sid,String goodsSid) {
+        ResultBean rb = new ResultBean().fail();
+        EmpCardVo card = baseMapper.getBagGoods(sid,goodsSid);
+        return rb.success().setData(card);
+    }
 }

src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java

@@ -109,8 +109,4 @@ public class EmpCardGiftRest {
 //    public ResultBean cardGrant(@RequestBody CardGrantDto dto) {
 //        return EmpCardGiftService.cardGrant(dto);
 //    }
-//@Scheduled(cron = "0/1 * * * * ?")
-//public void test() {
-//    System.out.println("执行");
-//}
 }

src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java

@@ -14,6 +14,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.yyth.api.empcard.EmpAppletVo;
 import com.yxt.yyth.api.empcard.EmpCard;
+import com.yxt.yyth.api.empcard.EmpCardVo;
 import com.yxt.yyth.api.empcardgift.*;
 import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsDto;
 import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo;
@@ -326,6 +327,13 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
         if(null==empCard){
             return rb.setMsg("请选择正确的企业卡");
         }
+        for(GoodsVo goodsVo:dto.getGoodsVoList()){
+            EmpCardVo vo= empCardService.getBagGoods(dto.getEmpCardSid(),goodsVo.getGoodsSid()).getData();
+            if(goodsVo.getSelect()*Integer.valueOf(dto.getCount())>vo.getGoodsNumber()){
+                return rb.setMsg("商品数量不足，请重新选择");
+            }
+        }
+        for (int k = 0; k < Integer.valueOf(dto.getCount()); k++) {
             EmpCardGrantLog record = new EmpCardGrantLog();
             record.setCreateTime(new DateTime());
             record.setEmpCardSid(dto.getEmpCardSid());
@@ -342,10 +350,13 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
             card.setState("1");
             card.setCreateTime(new DateTime());
             card.setGrantDate(new Date());
-        card.setCodeKey(dto.getCodeKey());
-        card.setCode(dto.getCode());
+
             String cardArea="9";
             String maxSerNum = baseMapper.selctMaxSerNum(cardArea);
+            String uuid = UniqueIdGenerator.generateUniqueID();
+            int randomNumber = new Random().nextInt(900000) + 100000;
+            card.setCodeKey(String.valueOf(randomNumber));
+            card.setCode("99"+uuid.substring(2));
             if (StringUtils.isBlank(maxSerNum)) {
                 card.setSerialNumber(cardArea + "0000001");
             } else {
@@ -387,6 +398,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
                     empCardService.changState(dto.getEmpCardSid(), "3");
                 }
             }
+        }
         return rb.success();
     }
     public ResultBean<EmpCardGiftVo> getEmpCardGoods(String empCardSid, String goodsSid) {

src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml

@@ -21,7 +21,8 @@
         boundary,
         boundaryPrice,
         iconUrl,
-        isEnable
+        isEnable,
+        isGrounding
         from lpk_giftbag
         <where>
             ${ew.sqlSegment}

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml

@@ -182,37 +182,6 @@
                 LEFT JOIN lpk_goods d ON d.sid = c.goodsSid
         GROUP BY
             a.sid,
-            c.goodsSid UNION ALL
-        SELECT
-            a.CODE AS CODE,
-            a.createTime AS createTime,
-            CASE
-                WHEN a.CODE IS NOT NULL THEN
-                    '福利卡'
-                END cardType,
-            CASE
-                a.state
-                WHEN 1 THEN
-                    '未绑卡'
-                WHEN 2 THEN
-                    '未绑卡'
-                WHEN 3 THEN
-                    '未预约'
-                WHEN 4 THEN
-                    '已预约'
-                WHEN 5 THEN
-                    '已完成'
-                END stateValue,
-            a.customerSid AS bind,
-            a.bindDate AS bindDate,
-            d.NAME AS goodsName,
-            c.goodsNumber AS goodsNumber
-        FROM
-            emp_card_gift a
-                LEFT JOIN emp_card_gift_goods c ON c.empCardGiftSid = a.sid
-                LEFT JOIN lpk_goods d ON d.sid = c.goodsSid
-        GROUP BY
-            a.sid,
-            c.goodsSid;
+            c.goodsSid
     </select>
 </mapper>

src/main/java/com/yxt/yyth/config/SaTokenGloableException.java

@@ -31,11 +31,13 @@ public class SaTokenGloableException extends GlobalExceptionHandler {
     }
     @ExceptionHandler({Exception.class})
     public ResultBean handleException(Exception e) {
-
+        if(null !=e.getMessage()){
             if(e.getMessage().contains("token 无效：")){
                 L.error(e.getMessage(), e);
                 return ResultBean.fireFail().setCode("5000").setMsg("系统异常：：" + e.getMessage());
             }
+        }
+
         L.error(e.getMessage(), e);
         return ResultBean.fireFail().setMsg("系统异常：：" + e.getMessage());
     }