3.26 修复测试bug

src/main/java/com/example/demo/Util/BaseDES.java

@@ -93,7 +93,7 @@ public class BaseDES {
 	public static void main(String args[]) {
 		try {
 			BaseDES d = new BaseDES();
-			String encryptedText = d.encrypt("90046726");
+			String encryptedText = d.encrypt("94226013");
 			System.out.println("加密结果：" + encryptedText);
 			System.out.println("加密字符串：90005179》"+d.encrypt("90005179"));
 			System.out.println("解密字符串：6aaef5277c050f7ae383f816651098ff》"+d.decrypt("6aaef5277c050f7ae383f816651098ff"));

src/main/java/com/example/demo/Util/GoldTistV2.java

@@ -218,7 +218,7 @@ public class GoldTistV2 {
  
 	public static void main(String[] args) throws Exception {
 		//调用demo
-		addCoinNew("94226013",55,-1,"退1金币测试",0,"刘志宏","文章11");
+		addCoinNew("94226013",64,1,"充1金币测试",0,"黄其振                              ","文章11");
 		
 	}
 	 

src/main/java/com/example/demo/controller/AuditController.java

@@ -101,7 +101,13 @@ public class  AuditController {
 //            refundMapper.updateOrderCode(detail.getContactId());
 //            userMapper.update(user);
             if(rechargeCoin!=null&&rechargeCoin.compareTo(BigDecimal.ZERO)!=0){
-                GoldTistV2.addCoinNew(detail.getJwcode(), 56, (rechargeCoin.add(taskCoin).add(freeCoin)).doubleValue(), audit.getRemark(), rechargeCoin.doubleValue(), admin.getName(), good);
+                GoldTistV2.addCoinNew(detail.getJwcode(), 56, rechargeCoin.doubleValue(), "金币退款", rechargeCoin.doubleValue(), admin.getName(), good);
+            }
+            if(freeCoin!=null&&freeCoin.compareTo(BigDecimal.ZERO)!=0){
+                GoldTistV2.addCoinNew(detail.getJwcode(), 55, freeCoin.doubleValue(), "金币退款", 0, admin.getName(), good);
+            }
+            if(taskCoin!=null&&taskCoin.compareTo(BigDecimal.ZERO)!=0){
+                GoldTistV2.addCoinNew(detail.getJwcode(), 57, taskCoin.doubleValue(),"金币退款", 0, admin.getName(), good);
             }
         }
         // 充值驳回

src/main/java/com/example/demo/mapper/ConsumeMapper.java

@@ -33,11 +33,11 @@ public interface ConsumeMapper {
 //            "(#{jwcode},#{activityId},#{rechargeWay},#{productId},'金币系统','购买商品',#{refundType},#{refundGoods},#{contactId},#{remark},#{rechargeCoin},#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,now(),1,#{orderCode})"
             "insert into detail_y",
             "(jwcode,order_code,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods," +
-                    "contact_id,remark,recharge_coin,free_coin,task_coin,admin_id,update_type,detail_flag,refund_flag,create_time,first_recharge,`name`,username,area)",
+                    "contact_id,remark,recharge_coin,free_coin,task_coin,admin_id,update_type,detail_flag,refund_flag,create_time,first_recharge,`name`,username,area,product_name)",
             "values ",
             "(#{jwcode},#{orderCode},#{activityId},#{rechargeWay},#{productId},'金币系统','购买商品',#{refundType}" +
                     ",#{refundGoods},#{contactId},#{remark},#{rechargeCoin}" +
-                    ",#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,1,now(),#{firstRecharge},#{name},#{username},#{area})"
+                    ",#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,1,now(),#{firstRecharge},#{name},#{username},#{area},#{productName})"
     })
 //    获取自增主键
     @Options(useGeneratedKeys = true,keyColumn = "detaily_id",keyProperty = "detailyId")
@@ -81,8 +81,8 @@ public interface ConsumeMapper {
 
     //查询消费信息
     @Select({
-            "select * ,product.name as productName from detail_y " ,
-            "inner join product on detail_y.product_id= product.product_id ",
+            "select *  from detail_y " ,
+//            "inner join product on detail_y.product_id= product.product_id ",
             "where  `detail_flag`=1 AND update_type = '1' and jwcode=#{jwcode} AND refund_flag=1"
     })
     List<Detail> getDeatil(String jwcode);

src/main/java/com/example/demo/mapper/StatisticsMapper.java

@@ -381,7 +381,7 @@ public interface StatisticsMapper {
     List<SumCoin> getMediumAreaPay();
 
 
-    @Select({"SELECT u.area  " ,
+    @Select({"SELECT u.area, " ,
             "    SUM(d.recharge_coin) / 100 AS totalRecharge," ,
             "    SUM(d.free_coin) / 100 AS totalFree," ,
             "    SUM(d.task_coin) / 100 AS totalTask," ,

src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java

@@ -113,7 +113,7 @@ public class ConsumeServiceImpl implements ConsumeService {
 
             // 更新用户对象以反映新的余额
             result = userMapper.updateGold(userGold);
-        GoldTistV2.addCoinNew(jwcode, 65, (paidGold1.add(freeGold1).add(taskGold1)).doubleValue(), "购买商品", paidGold1.doubleValue(),username,product);
+        GoldTistV2.addCoinNew(jwcode, 65, (paidGold1.add(freeGold1).add(taskGold1).divide(new BigDecimal("100"))).doubleValue(), "购买商品", paidGold1.doubleValue(),username,product);
 
 
         return result;

src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java

@@ -84,6 +84,8 @@ public class OtherServiceImpl implements OtherService {
         typesToUpdateZero.add("53");
         typesToUpdateZero.add("54");
         typesToUpdateZero.add("60");
+        typesToUpdateZero.add("64");
+        typesToUpdateZero.add("63");
 
         typesToUpdateOne.add("9");
         typesToUpdateOne.add("15");