小票精度问题修复

kmall-admin/src/main/java/com/kmall/admin/controller/SysOssController.java

@@ -2,6 +2,8 @@ package com.kmall.admin.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.kmall.admin.entity.SysOssEntity;
+import com.kmall.admin.haikong.task.MemberSysAccessTokenRefreshTask;
+import com.kmall.admin.utils.jackson.JacksonUtil;
 import com.kmall.common.fileserver.util.FileManager;
 import com.kmall.common.oss.CloudStorageConfig;
 import com.kmall.admin.fromcomm.service.SysConfigService;
@@ -12,6 +14,8 @@ import com.kmall.common.validator.group.AliyunGroup;
 import com.kmall.common.validator.group.QcloudGroup;
 import com.kmall.common.validator.group.QiniuGroup;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,6 +41,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("sys/oss")
 public class SysOssController {
+    private static final Logger log = LoggerFactory.getLogger(SysOssController.class);
     @Autowired
     private SysOssService sysOssService;
     @Autowired
@@ -118,12 +123,20 @@ public class SysOssController {
             throw new RRException("上传图片，不能超过 300k");
         }
         //上传文件
-        String url = FileManager.upload(file);
+        String url="";
+        try {
+            url= FileManager.upload(file);
+        }catch (Exception e){
+            log.debug("上传文件:{}",e);
+            R.error("上传失败");
+        }
+
 
         //保存文件信息
         SysOssEntity ossEntity = new SysOssEntity();
         ossEntity.setUrl(url);
         ossEntity.setCreateDate(new Date());
+        log.debug("上传文件数据:{}", JacksonUtil.toJson(ossEntity));
         sysOssService.save(ossEntity);
 
         R r = new R();

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -592,6 +592,8 @@ public class OrderServiceImpl implements OrderService {
                 new BigDecimal(orderEntity.getFreightPrice()).setScale(2, BigDecimal.ROUND_HALF_UP).toString());
         cashInfo.setDeductionScore(memberConsumptionRecordsEntity.getDeductionScore());
         cashInfo.setScoreDeductionPrice(memberConsumptionRecordsEntity.getScoreDeductionPrice().toString());
+        // 其他优惠金额=优惠合计-积分抵扣金额
+        cashInfo.setOtherDiscountedPrice(discountedPrice.subtract(memberConsumptionRecordsEntity.getScoreDeductionPrice()));
         if ("alipay".equals(orderEntity.getPayFlag())) {
             cashInfo.setPaymentMode("支付宝支付");
         } else {

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1838,7 +1838,7 @@ function getPrintContentOrder(ticket, callback) {
      */
     content += "<div style=\"width: 100%;\">";
     content += "<span style=\"float: left;width: 50%;text-align: left;\">其他优惠:</span>";
-    content += "<span style=\"float: right;width: 50%;text-align: right;\">" + (ticket.cashInfo.oddChange - ticket.cashInfo.scoreDeductionPrice) + "元</span>";
+    content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.otherDiscountedPrice + "元</span>";
     content += "</div>";
     content += "<div style=\"width: 100%;\">";
     content += "<span style=\"float: left;width: 50%;text-align: left;\">优惠合计:</span>";

kmall-admin/src/main/webapp/js/shop/store.js

@@ -175,7 +175,9 @@ let vm = new Vue({
                     title: res.msg,
                     desc: "无上传文件的权限，请联系管理员授权"
                 });
+                return
             }
+            alert("上传成功")
             vm.store.storeImgUrl = file.response.url;
         },
         del: function (event) {

kmall-common/src/main/java/com/kmall/common/utils/print/ticket/item/CashInfo.java

@@ -1,6 +1,7 @@
 package com.kmall.common.utils.print.ticket.item;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 收银信息
@@ -22,7 +23,7 @@ public class CashInfo implements Serializable {
 
     // 实收款
     private String receipts;
-    // 找零
+    // 找零   优惠合计
     private String oddChange;
     // 优惠券
     private String coupon;
@@ -45,7 +46,18 @@ public class CashInfo implements Serializable {
      * 积分抵扣金额
      */
     private String scoreDeductionPrice;
+    /**
+     * 其他优惠金额
+     */
+    private BigDecimal otherDiscountedPrice;
 
+    public BigDecimal getOtherDiscountedPrice() {
+        return otherDiscountedPrice;
+    }
+
+    public void setOtherDiscountedPrice(BigDecimal otherDiscountedPrice) {
+        this.otherDiscountedPrice = otherDiscountedPrice;
+    }
 
     public String getTotal() {
         return total;