diff --git a/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java b/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java index bc0c1f9..7bfa7db 100644 --- a/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java +++ b/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java @@ -47,10 +47,10 @@ public class GiftBagGoodss { e.printStackTrace(); } } - int js = 1; + double js = 1; if (StrUtil.isNotBlank(weight)) { try { - js = Integer.parseInt(weight); + js = Double.parseDouble(weight); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/yxt/yythmall/biz/customerinvoice/CustomerInvoiceService.java b/src/main/java/com/yxt/yythmall/biz/customerinvoice/CustomerInvoiceService.java index 238d447..df2c855 100644 --- a/src/main/java/com/yxt/yythmall/biz/customerinvoice/CustomerInvoiceService.java +++ b/src/main/java/com/yxt/yythmall/biz/customerinvoice/CustomerInvoiceService.java @@ -51,8 +51,10 @@ public class CustomerInvoiceService extends MybatisBaseService().eq("customerSid",dto.getCustomerSid()) .eq("isDefault","1")); - customerInvoice.setIsDefault("0"); - baseMapper.updateById(customerInvoice); + if(customerInvoice!=null){ + customerInvoice.setIsDefault("0"); + baseMapper.updateById(customerInvoice); + } } if (StringUtils.isNotBlank(dto.getSid())) { String dtoSid = dto.getSid(); diff --git a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java index 81ba119..848488f 100644 --- a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java +++ b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java @@ -90,7 +90,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { .excludePathPatterns("/shoppingcart/shoppingCartList") .excludePathPatterns("/shoppingcart/delShoppingCart/**") .excludePathPatterns("/lpkgoods/vegeCellarTypeList") - .excludePathPatterns("/vegetablecellar/addGoods/**") +// .excludePathPatterns("/vegetablecellar/addGoods/**") .excludePathPatterns("/lpkgoods/vegeCellarList") .excludePathPatterns("/customerstore/getStoreBySid/**") .excludePathPatterns("/lpkgiftcard/bindAllCard") @@ -116,7 +116,6 @@ public class SaTokenConfigure implements WebMvcConfigurer { .excludePathPatterns("/invoicetype/listAll") .excludePathPatterns("/invoicerecords/save") .excludePathPatterns("/lpkgoods/vegeCellarInvalidList") - .excludePathPatterns("//wxapi/**") - ; + .excludePathPatterns("//wxapi/**"); } }