去掉后端的所有元

crmeb_src/mer_java/crmeb-admin/src/test/java/com/zbkj/admin/ProductPriceTaskTest.java

@@ -26,9 +26,9 @@ public class ProductPriceTaskTest {
         System.out.println("开始执行产品价格更新任务测试...");
 
         // 模拟 Redis 中的汇率值 (假设 1 LGNS = 5.5 RMB)
-        BigDecimal mockRate = new BigDecimal("5.5");
-        redisUtil.set(SysConfigConstants.DAIBI_RATE_LGNS_CNY, mockRate);
-        System.out.println("模拟汇率已设置: " + mockRate);
+//        BigDecimal mockRate = new BigDecimal("5.5");
+//        redisUtil.set(SysConfigConstants.DAIBI_RATE_LGNS_CNY, mockRate);
+//        System.out.println("模拟汇率已设置: " + mockRate);
 
         try {
             productTaskService.updateProductPrice();

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/BrokerageToYueRequest.java

@@ -31,6 +31,6 @@ public class BrokerageToYueRequest implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "转入余额金额，非全部转入时必传")
-    @DecimalMin(value = "0.01", message = "转入余额金额，必须大与等于0.01元")
+    @DecimalMin(value = "0.01", message = "转入余额金额，必须大与等于0.01")
     private BigDecimal price;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/IntegralConfigResponse.java

@@ -44,7 +44,7 @@ public class IntegralConfigResponse implements Serializable {
 
     @ApiModelProperty(value = "积分抵扣开启金额(单位元),订单满多少钱可以使用积分抵扣")
     @NotNull(message = "积分抵扣开启金额不能为空")
-    @Min(value = 0, message = "积分抵扣开启金额最小为0元")
+    @Min(value = 0, message = "积分抵扣开启金额最小为0")
     private Integer integralDeductionStartMoney;
 
     @ApiModelProperty(value = "积分抵扣金额(1积分抵多少金额，0.01)")

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java

@@ -374,7 +374,7 @@ public class OrderTaskServiceImpl implements OrderTaskService {
         platBill.setPm(BillConstants.BILL_PM_SUB);
         platBill.setAmount(platRefundPayPrice);
         platBill.setType(BillConstants.BILL_TYPE_REFUND_ORDER);
-        platBill.setMark(StrUtil.format("订单退款，平台返还分账金额{}元", platRefundPayPrice));
+        platBill.setMark(StrUtil.format("订单退款，平台返还分账金额{}", platRefundPayPrice));
 
         orderProfitSharing.setProfitSharingRefund(orderProfitSharing.getProfitSharingRefund().add(refundOrder.getRefundPrice()));
         orderProfitSharing.setRefundFreightFee(orderProfitSharing.getRefundFreightFee().add(refundOrder.getRefundFreightFee()));
@@ -446,7 +446,7 @@ public class OrderTaskServiceImpl implements OrderTaskService {
                 bill.setPm(BillConstants.BILL_PM_SUB);
                 bill.setAmount(platReplacePrice);
                 bill.setType(BillConstants.BILL_TYPE_REFUND_ORDER);
-                bill.setMark(StrUtil.format("订单退款，平台代扣佣金应退金额{}元", platReplacePrice));
+                bill.setMark(StrUtil.format("订单退款，平台代扣佣金应退金额{}", platReplacePrice));
                 billService.save(bill);
             }
             if (refundOrderInfo.getRefundUseIntegral() > 0) {
@@ -457,7 +457,7 @@ public class OrderTaskServiceImpl implements OrderTaskService {
                 bill.setPm(BillConstants.BILL_PM_ADD);
                 bill.setAmount(refundOrderInfo.getRefundIntegralPrice());
                 bill.setType(BillConstants.BILL_TYPE_REFUND_ORDER);
-                bill.setMark(StrUtil.format("订单退款，平台代扣积分抵扣金额返还{}元", refundOrderInfo.getRefundIntegralPrice()));
+                bill.setMark(StrUtil.format("订单退款，平台代扣积分抵扣金额返还{}", refundOrderInfo.getRefundIntegralPrice()));
                 billService.save(bill);
             }
             billService.save(platBill);
@@ -535,7 +535,7 @@ public class OrderTaskServiceImpl implements OrderTaskService {
         merchantBill.setUid(refundOrder.getUid());
         merchantBill.setPm(BillConstants.BILL_PM_SUB);
         merchantBill.setAmount(refundOrder.getMerchantRefundPrice().add(refundOrder.getRefundFreightFee()));
-        merchantBill.setMark(StrUtil.format("订单{}退款{}元，商户支出{}元,退运费{}元", refundOrder.getOrderNo(), refundOrder.getRefundPrice(), refundOrder.getMerchantRefundPrice(), refundOrder.getRefundFreightFee()));
+        merchantBill.setMark(StrUtil.format("订单{}退款{}，商户支出{},退运费{}", refundOrder.getOrderNo(), refundOrder.getRefundPrice(), refundOrder.getMerchantRefundPrice(), refundOrder.getRefundFreightFee()));
         return merchantBill;
     }
 

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java

@@ -680,7 +680,7 @@ public class PayServiceImpl implements PayService {
             merchantBalanceRecord.setLinkType("order");
             merchantBalanceRecord.setType(1);
             merchantBalanceRecord.setAmount(sharing.getProfitSharingMerPrice().add(sharing.getFreightFee()));
-            merchantBalanceRecord.setTitle(StrUtil.format("订单支付，商户预计分账金额{}元", merchantBalanceRecord.getAmount()));
+            merchantBalanceRecord.setTitle(StrUtil.format("订单支付，商户预计分账金额{}", merchantBalanceRecord.getAmount()));
             merchantBalanceRecord.setBalance(BigDecimal.ZERO);
             merchantBalanceRecord.setStatus(1);
             return merchantBalanceRecord;
@@ -1152,10 +1152,10 @@ public class PayServiceImpl implements PayService {
             }
             // 组装数据
 //            temMap.put("character_string1", storeOrder.getOrderId());
-//            temMap.put("amount2", storeOrder.getPayPrice().toString() + "元");
+//            temMap.put("amount2", storeOrder.getPayPrice().toString());
 //            temMap.put("thing7", "您的订单已支付成功");
             temMap.put("character_string3", order.getOrderNo());
-            temMap.put("amount9", order.getPayPrice().toString() + "元");
+            temMap.put("amount9", order.getPayPrice().toString());
             temMap.put("thing6", "您的订单已支付成功");
             templateMessageService.pushMiniTemplateMessage(payNotification.getRoutineId(), temMap, userToken.getToken());
         }
@@ -1359,7 +1359,7 @@ public class PayServiceImpl implements PayService {
         merchantBill.setPm(BillConstants.BILL_PM_ADD);
         BigDecimal merFee = merchantOrder.getPayPostage().add(merchantFee);
         merchantBill.setAmount(merFee);
-        merchantBill.setMark(StrUtil.format("订单{}支付{}元，商户收入{}元", merchantOrder.getOrderNo(), merchantOrder.getPayPrice(), merFee));
+        merchantBill.setMark(StrUtil.format("订单{}支付{}，商户收入{}", merchantOrder.getOrderNo(), merchantOrder.getPayPrice(), merFee));
         return merchantBill;
     }
 
@@ -1381,11 +1381,11 @@ public class PayServiceImpl implements PayService {
         if (order.getPayType().equals(PayConstants.PAY_TYPE_YUE)) {
             payBill.setPm(BillConstants.BILL_PM_SUB);
             payBill.setType(BillConstants.BILL_TYPE_YUE_PAY);
-            payBill.setMark(StrUtil.format("余额支付成功，扣除用户余额{}元", order.getPayPrice()));
+            payBill.setMark(StrUtil.format("余额支付成功，扣除用户余额{}", order.getPayPrice()));
         } else {
             payBill.setPm(BillConstants.BILL_PM_ADD);
             payBill.setType(BillConstants.BILL_TYPE_PAY_ORDER);
-            payBill.setMark(StrUtil.format("订单支付成功，支付金额{}元", order.getPayPrice()));
+            payBill.setMark(StrUtil.format("订单支付成功，支付金额{}", order.getPayPrice()));
         }
         billList.add(payBill);
 
@@ -1395,7 +1395,7 @@ public class PayServiceImpl implements PayService {
         collectBill.setAmount(orderProfitSharing.getProfitSharingMerPrice().add(merchantOrder.getPayPostage()));
         collectBill.setPm(BillConstants.BILL_PM_SUB);
         collectBill.setType(BillConstants.BILL_TYPE_MERCHANT_COLLECT);
-        collectBill.setMark(StrUtil.format("订单支付成功，商户分账{}元", orderProfitSharing.getProfitSharingMerPrice().add(merchantOrder.getPayPostage())));
+        collectBill.setMark(StrUtil.format("订单支付成功，商户分账{}", orderProfitSharing.getProfitSharingMerPrice().add(merchantOrder.getPayPostage())));
         billList.add(collectBill);
 
         Bill platBill = new Bill();
@@ -1403,7 +1403,7 @@ public class PayServiceImpl implements PayService {
         platBill.setAmount(orderProfitSharing.getProfitSharingPlatPrice());
         platBill.setPm(BillConstants.BILL_PM_ADD);
         platBill.setType(BillConstants.BILL_TYPE_PAY_ORDER);
-        platBill.setMark(StrUtil.format("订单支付成功，平台手续费{}元", orderProfitSharing.getProfitSharingPlatPrice()));
+        platBill.setMark(StrUtil.format("订单支付成功，平台手续费{}", orderProfitSharing.getProfitSharingPlatPrice()));
         billList.add(platBill);
 
         if (ObjectUtil.isNotNull(orderProfitSharing.getFirstBrokerageFee()) && orderProfitSharing.getFirstBrokerageFee().compareTo(BigDecimal.ZERO) > 0) {
@@ -1412,7 +1412,7 @@ public class PayServiceImpl implements PayService {
             firstBill.setAmount(orderProfitSharing.getFirstBrokerageFee());
             firstBill.setPm(BillConstants.BILL_PM_SUB);
             firstBill.setType(BillConstants.BILL_TYPE_BROKERAGE);
-            firstBill.setMark(StrUtil.format("订单支付成功，分配一级佣金{}元", orderProfitSharing.getFirstBrokerageFee()));
+            firstBill.setMark(StrUtil.format("订单支付成功，分配一级佣金{}", orderProfitSharing.getFirstBrokerageFee()));
             billList.add(firstBill);
             if (orderProfitSharing.getSecondBrokerageFee().compareTo(BigDecimal.ZERO) > 0) {
                 Bill secondBill = new Bill();
@@ -1420,7 +1420,7 @@ public class PayServiceImpl implements PayService {
                 secondBill.setAmount(orderProfitSharing.getSecondBrokerageFee());
                 secondBill.setPm(BillConstants.BILL_PM_SUB);
                 secondBill.setType(BillConstants.BILL_TYPE_BROKERAGE);
-                secondBill.setMark(StrUtil.format("订单支付成功，分配二级佣金{}元", orderProfitSharing.getSecondBrokerageFee()));
+                secondBill.setMark(StrUtil.format("订单支付成功，分配二级佣金{}", orderProfitSharing.getSecondBrokerageFee()));
                 billList.add(secondBill);
             }
         }
@@ -1431,7 +1431,7 @@ public class PayServiceImpl implements PayService {
             integralBill.setAmount(order.getIntegralPrice());
             integralBill.setPm(BillConstants.BILL_PM_SUB);
             integralBill.setType(BillConstants.BILL_TYPE_PAY_ORDER);
-            integralBill.setMark(StrUtil.format("订单支付成功，用户使用{}积分抵扣{}元，平台扣除", orderProfitSharing.getIntegralNum(), orderProfitSharing.getIntegralPrice()));
+            integralBill.setMark(StrUtil.format("订单支付成功，用户使用{}积分抵扣{}，平台扣除", orderProfitSharing.getIntegralNum(), orderProfitSharing.getIntegralPrice()));
             billList.add(integralBill);
         }
         return billList;

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/RechargeOrderServiceImpl.java

@@ -404,7 +404,7 @@ public class RechargeOrderServiceImpl extends ServiceImpl<RechargeOrderDao, Rech
         bill.setPm(BillConstants.BILL_PM_ADD);
         bill.setAmount(rechargeOrder.getPrice());
         bill.setType(BillConstants.BILL_TYPE_RECHARGE_USER);
-        bill.setMark(StrUtil.format("充值订单，用户充值金额{}元", rechargeOrder.getPrice()));
+        bill.setMark(StrUtil.format("充值订单，用户充值金额{}", rechargeOrder.getPrice()));
         Boolean execute = transactionTemplate.execute(e -> {
             // 订单变动
             boolean updatePaid = updatePaid(rechargeOrder.getId(), rechargeOrder.getOrderNo());

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/RetailStoreServiceImpl.java

@@ -424,7 +424,7 @@ public class RetailStoreServiceImpl implements RetailStoreService {
         }
 
         if (money.compareTo(request.getClosingPrice()) < 0) {
-            throw new CrmebException(UserResultCode.USER_BROKERAGE_INSUFFICIENT.setMessage("你当前最多可提现 " + money + "元"));
+            throw new CrmebException(UserResultCode.USER_BROKERAGE_INSUFFICIENT.setMessage("你当前最多可提现 " + money ));
         }
 
         UserClosing userClosing = new UserClosing();
@@ -544,7 +544,7 @@ public class RetailStoreServiceImpl implements RetailStoreService {
         bill.setPm(BillConstants.BILL_PM_ADD);
         bill.setAmount(price);
         bill.setType(BillConstants.BILL_TYPE_BROKERAGE);
-        bill.setMark(StrUtil.format("佣金转余额，用户佣金转余额{}元", price));
+        bill.setMark(StrUtil.format("佣金转余额，用户佣金转余额{}", price));
         Boolean execute = transactionTemplate.execute(e -> {
             Boolean result = userService.brokerageToYue(user.getId(), brokerageRecord.getPrice());
             if (!result) {
@@ -766,7 +766,7 @@ public class RetailStoreServiceImpl implements RetailStoreService {
         }
         String minPrice = systemConfigService.getValueByKeyException(SysConfigConstants.RETAIL_STORE_EXTRACT_MIN_PRICE);
         if (request.getClosingPrice().compareTo(new BigDecimal(minPrice)) < 0) {
-            throw new CrmebException(CommonResultCode.VALIDATE_FAILED, StrUtil.format("最低提现金额{}元", minPrice));
+            throw new CrmebException(CommonResultCode.VALIDATE_FAILED, StrUtil.format("最低提现金额{}", minPrice));
         }
     }
 }

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java

@@ -937,7 +937,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
                 userBill.setMark(StrUtil.format("后台操作增加了{}余额", request.getMoney()));
 
                 bill.setPm(BillConstants.BILL_PM_SUB);
-                bill.setMark(StrUtil.format("后台操作给用户增加余额{}元", request.getMoney()));
+                bill.setMark(StrUtil.format("后台操作给用户增加余额{}", request.getMoney()));
 
                 balanceRecord.setType(BalanceRecordConstants.BALANCE_RECORD_TYPE_ADD);
                 balanceRecord.setBalance(user.getNowMoney().add(request.getMoney()));
@@ -951,7 +951,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
                 userBill.setMark(StrUtil.format("后台操作减少了{}余额", request.getMoney()));
 
                 bill.setPm(BillConstants.BILL_PM_ADD);
-                bill.setMark(StrUtil.format("后台操作给用户扣减余额{}元", request.getMoney()));
+                bill.setMark(StrUtil.format("后台操作给用户扣减余额{}", request.getMoney()));
 
                 balanceRecord.setType(BalanceRecordConstants.BALANCE_RECORD_TYPE_SUB);
                 balanceRecord.setBalance(user.getNowMoney().subtract(request.getMoney()));

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/util/PrintUtil.java

@@ -158,10 +158,10 @@ public class PrintUtil {
                 printSb.append("********************************\n");
                 printSb.append("<FH>");
                 printSb.append("<LR>赠送积分:"+order.getGainIntegral()+"</LR>");
-                printSb.append("<LR>合计:"+ order.getProTotalPrice()+"元，优惠:"+order.getCouponPrice()+"元</LR>");
-                printSb.append("<LR>邮费:"+order.getTotalPostage()+"元，抵扣:"+order.getIntegralPrice()+"元</LR>");
+                printSb.append("<LR>合计:"+ order.getProTotalPrice()+"，优惠:"+order.getCouponPrice()+"</LR>");
+                printSb.append("<LR>邮费:"+order.getTotalPostage()+"，抵扣:"+order.getIntegralPrice()+"</LR>");
                 printSb.append("</FH>");
-                printSb.append("<FH><right>实际支付:"+ order.getPayPrice() +"元</right></FH>");
+                printSb.append("<FH><right>实际支付:"+ order.getPayPrice() +"</right></FH>");
                 printSb.append("<FB><FB><center>完</center></FB></FB>");
             } else {
                 PrintContentVo printContentVo = JSON.parseObject(merchantPrint.getContent(), PrintContentVo.class);
@@ -196,13 +196,13 @@ public class PrintUtil {
                     printSb.append("********************************\n");
                 }
                 if (printContentVo.getFreightInfo().equals(1)) {
-                    printSb.append("<right>运费:"+ order.getPayPostage().toString() +"元\n</right>");
+                    printSb.append("<right>运费:"+ order.getPayPostage().toString() +"\n</right>");
                 }
                 if (printContentVo.getDiscountInfo().equals(1)) {
-                    printSb.append("<right>优惠:-"+ order.getCouponPrice().add(order.getSvipDiscountPrice()) +"元\n</right>");
-                    printSb.append("<right>抵扣:-"+ order.getIntegralPrice().toString() +"元\n</right>");
+                    printSb.append("<right>优惠:-"+ order.getCouponPrice().add(order.getSvipDiscountPrice()) +"\n</right>");
+                    printSb.append("<right>抵扣:-"+ order.getIntegralPrice().toString() +"\n</right>");
                     if (order.getIsSvip() && order.getSvipDiscountPrice().compareTo(BigDecimal.ZERO) > 0) {
-                        printSb.append("<right>会员优惠:-"+ order.getSvipDiscountPrice() +"元\n</right>");
+                        printSb.append("<right>会员优惠:-"+ order.getSvipDiscountPrice() +"\n</right>");
                     }
                     printSb.append("———————————————\n");
                 }
@@ -224,7 +224,7 @@ public class PrintUtil {
                         printSb.append("<right>支付方式:"+ payType +"\n</right>");
                     }
                     if (printContentVo.getPayInfo().contains(2)) {
-                        printSb.append("<right>实收金额:"+ order.getPayPrice().toString() +"元\n</right>");
+                        printSb.append("<right>实收金额:"+ order.getPayPrice().toString() +"\n</right>");
                     }
                     printSb.append("———————————————\n");
                 }

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/util/feiEYun.java

@@ -225,9 +225,9 @@ public class feiEYun {
             content.append(printUtil.printFormatGoodsList(orderDetailService.getShipmentByOrderNo(order.getOrderNo())));
             content.append("--------------------------------<BR>");
             content.append("赠送积分:"+order.getGainIntegral()+"<BR>");
-            content.append("合计:"+ order.getProTotalPrice()+"元，优惠:"+order.getCouponPrice()+"元<BR>");
-            content.append("邮费:"+order.getTotalPostage()+"元，抵扣:"+order.getIntegralPrice()+"元<BR>");
-            content.append("<L>实际支付:"+ order.getPayPrice() +"元</L><BR>");
+            content.append("合计:"+ order.getProTotalPrice()+"，优惠:"+order.getCouponPrice()+"<BR>");
+            content.append("邮费:"+order.getTotalPostage()+"，抵扣:"+order.getIntegralPrice()+"<BR>");
+            content.append("<L>实际支付:"+ order.getPayPrice() +"</L><BR>");
         } else {
             PrintContentVo printContentVo = JSON.parseObject(merchantPrint.getContent(), PrintContentVo.class);
             if (printContentVo.getSmallTickerHeader().equals(1)) {
@@ -261,14 +261,14 @@ public class feiEYun {
                 content.append("********************************<BR>");
             }
             if (printContentVo.getFreightInfo().equals(1)) {
-                content.append("<RIGHT>运费:"+ order.getPayPostage().toString() +"元</RIGHT><BR>");
+                content.append("<RIGHT>运费:"+ order.getPayPostage().toString() +"</RIGHT><BR>");
             }
             if (printContentVo.getDiscountInfo().equals(1)) {
                 BigDecimal discountPrice = order.getCouponPrice().add(order.getSvipDiscountPrice());
-                content.append("<RIGHT>优惠:-"+ discountPrice +"元</RIGHT><BR>");
-                content.append("<RIGHT>抵扣:-"+ order.getIntegralPrice().toString() +"元</RIGHT><BR>");
+                content.append("<RIGHT>优惠:-"+ discountPrice +"</RIGHT><BR>");
+                content.append("<RIGHT>抵扣:-"+ order.getIntegralPrice().toString() +"</RIGHT><BR>");
                 if (order.getIsSvip() && order.getSvipDiscountPrice().compareTo(BigDecimal.ZERO) > 0) {
-                    content.append("<RIGHT>会员优惠:-"+ order.getSvipDiscountPrice().toString() +"元</RIGHT><BR>");
+                    content.append("<RIGHT>会员优惠:-"+ order.getSvipDiscountPrice().toString() +"</RIGHT><BR>");
                 }
                 content.append("———————————————<BR>");
             }
@@ -290,7 +290,7 @@ public class feiEYun {
                     content.append("<RIGHT>支付方式:"+ payType +"</RIGHT><BR>");
                 }
                 if (printContentVo.getPayInfo().contains(2)) {
-                    content.append("<RIGHT>实收金额:"+ order.getPayPrice().toString() +"元</RIGHT><BR>");
+                    content.append("<RIGHT>实收金额:"+ order.getPayPrice().toString() +"</RIGHT><BR>");
                     content.append("———————————————<BR>");
                 }
             }