wangpengfei 1 year ago
parent
commit
badd52ab73
  1. 1
      src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java
  2. 1
      src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java
  3. 2
      src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
  4. 6
      src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java

1
src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsVo.java

@ -20,6 +20,7 @@ public class TransferRecordsVo implements Vo {
private String sid; private String sid;
private String customerSid;//客户sid private String customerSid;//客户sid
private String transferCode;//转赠code private String transferCode;//转赠code
private String newCode;//转赠code 加空格
private String affiliation;//所属菜窖 private String affiliation;//所属菜窖
private String state;// private String state;//
private String stateValue;// private String stateValue;//

1
src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java

@ -43,5 +43,6 @@ public class VegeCellarReserveOrderVo implements Vo {
private String stateValue; private String stateValue;
private String affiliationValue; private String affiliationValue;
private String reserveCode; private String reserveCode;
private String newCode;
private boolean showLsit=false; private boolean showLsit=false;
} }

2
src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java

@ -137,7 +137,7 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
} }
} }
if(StringUtils.isNotBlank(vo.getTransferCode())){ if(StringUtils.isNotBlank(vo.getTransferCode())){
vo.setTransferCode(addSpaces(vo.getTransferCode())); vo.setNewCode(addSpaces(vo.getTransferCode()));
} }
// vo.setGoodsVo(goodsVo); // vo.setGoodsVo(goodsVo);
} }

6
src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java

@ -343,7 +343,9 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
vo.setGoodss(vo.getGoodss() + " " + lpkGoods.getName() + ":" + goods1.getNum() + lpkGoods.getUnitName()); vo.setGoodss(vo.getGoodss() + " " + lpkGoods.getName() + ":" + goods1.getNum() + lpkGoods.getUnitName());
} }
} }
vo.setReserveCode(addSpaces(vo.getReserveCode())); if(StringUtils.isNotBlank(vo.getReserveCode())){
vo.setNewCode(addSpaces(vo.getReserveCode()));
}
vo.setGoodsVo(goodsVo); vo.setGoodsVo(goodsVo);
} }
@ -887,7 +889,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
} }
/** /**
* 单号每四位加空格 * 单号每四位加空格
* @param newCode * @param
* @return * @return
*/ */
public static String addSpaces(String code) { public static String addSpaces(String code) {

Loading…
Cancel
Save