Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardExport.java

@@ -12,11 +12,14 @@ import lombok.Data;
 public class LpkGiftCardExport {
     @ExportEntityMap(CnName = "提货二维码", EnName = "pic")
     private String pic;
-    @ExportEntityMap(CnName = "提货编码", EnName = "code")
-    private String code;
+    @ExportEntityMap(CnName = "提货编码第一行", EnName = "code1")
+    private String code1;
+    @ExportEntityMap(CnName = "提货编码第二行", EnName = "code2")
+    private String code2;
     @ExportEntityMap(CnName = "提货密码", EnName = "codeKey")
     private String codeKey;
     @ExportEntityMap(CnName = "序列号", EnName = "serialNumber")
     private String serialNumber;
+    private String code;
 
 }

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -114,6 +114,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         return rb.success().setData(p);
     }
+
     public ResultBean updateIsItInvalid() {
         ResultBean rb = new ResultBean();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -126,6 +127,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         }
         return rb.success();
     }
+
     public ResultBean<AppletVo> getGifCardBySid(String sid) {
         ResultBean rb = new ResultBean().fail();
         AppletVo vo = baseMapper.getGifCardBySid(sid);
@@ -209,6 +211,9 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
 //        vo.setSelect(l);
         LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
         if (null != vo1) {
+//        vo.setSelect(l);
+//        LpkReserveOrderVo vo1 =lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
+//        if(null!=vo1){
             vo.setStoreSid(vo1.getStore());
         }
         return rb.success().setData(vo);
@@ -376,6 +381,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
             for (LpkGiftCardExport lpkGiftCardExport : exportList) {
                 if (StringUtils.isNotBlank(lpkGiftCardExport.getCode())) {
                     lpkGiftCardExport.setPic(finUrl + lpkGiftCardExport.getCode());
+                    lpkGiftCardExport.setCode1(lpkGiftCardExport.getCode().substring(0,10));
+                    lpkGiftCardExport.setCode2(lpkGiftCardExport.getCode().substring(lpkGiftCardExport.getCode().length() - 10));
                 }
             }
         }
@@ -392,6 +399,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         ExportExcelUtils.export(fileNameURL, exportList, LpkGiftCardExport.class, response);
 
     }
+
     public ResultBean cardGrant(CardGrantDto dto) {
         ResultBean rb = new ResultBean().fail();
         int start = Integer.parseInt(dto.getStart());
@@ -424,6 +432,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         baseMapper.updateState(serialNumbers, "2", dto.getBankSid(), r);
         return rb.success().setData("成功");
     }
+
     public ResultBean<Integer> cardGrantCount(String recordSid) {
         ResultBean rb = new ResultBean().fail();
         Integer i = baseMapper.cardGrantCount(recordSid);