/1

order/src/main/java/com/order/controller/business/OrderSettlementController.java

@@ -162,7 +162,7 @@ public class OrderSettlementController {
                     }
 
                     EasyExcel.write(fileUrl+pathName)
-                            .head(OrderGoodsExportModel.class)
+                            .head(MerOrderSettlementDetailModel.class)
                             .sheet(fileRecords.getTitle())
                             .doWrite(list);
 
@@ -289,7 +289,7 @@ public class OrderSettlementController {
                     }
 
                     EasyExcel.write(fileUrl+pathName)
-                            .head(OrderGoodsExportModel.class)
+                            .head(OrderSettlementModel.class)
                             .sheet(fileRecords.getTitle())
                             .doWrite(list);
 
@@ -416,7 +416,7 @@ public class OrderSettlementController {
                     }
 
                     EasyExcel.write(fileUrl+pathName)
-                            .head(OrderGoodsExportModel.class)
+                            .head(OrderSettlementSumModel.class)
                             .sheet(fileRecords.getTitle())
                             .doWrite(list);
 

service/src/main/java/com/hfkj/common/utils/DateUtil.java

@@ -48,7 +48,7 @@ public class DateUtil {
 		return str;
 	}
 	 
-	public static Date long2Date(Long time) throws Exception{
+	public static Date long2Date(Long time){
 		if(time != null){
 			return new Date(time);
 		}else{

service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java

@@ -22,6 +22,8 @@ import com.hfkj.service.goods.*;
 import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
 import com.hfkj.service.hlt.HuiLianTongUnionCardService;
 import com.hfkj.sysenum.GoodsVpdSourceEnum;
+import com.hfkj.sysenum.UserLoginPlatform;
+import com.hfkj.sysenum.mer.PayPlatformEnum;
 import com.hfkj.sysenum.order.*;
 import com.hfkj.yushang.YuShangService;
 import org.slf4j.Logger;
@@ -369,6 +371,12 @@ public class OrderPaySuccessService {
             orderMeiTuan.setIntegralDiscountPrice(childOrder.getIntegralDiscountPrice());
             orderMeiTuan.setPayRealPrice(childOrder.getSurplusRefundPrice());
             orderMeiTuan.setPayChannel(order.getPayChannel());
+            if (order.getPayType() == OrderPayTypeEnum.type3.getCode()) {
+                orderMeiTuan.setPlatformCode(UserLoginPlatform.VFAMILY.getCode());
+            }
+            if (order.getPayType() == OrderPayTypeEnum.type4.getCode()) {
+                orderMeiTuan.setPlatformCode(UserLoginPlatform.WXAPPLETS.getCode());
+            }
             orderMeiTuan.setPayType(order.getPayType());
             orderMeiTuan.setPaySerialNo(order.getPaySerialNo());
             orderMeiTuan.setPayTime(order.getPayTime());

service/src/main/java/com/hfkj/service/order/impl/OrderSettlementServiceImpl.java

@@ -12,8 +12,8 @@ import com.hfkj.service.coupon.BsOrderCouponService;
 import com.hfkj.service.goods.*;
 import com.hfkj.service.order.OrderSettlementService;
 import com.hfkj.sysenum.UserLoginPlatform;
-import com.hfkj.sysenum.mer.PayPlatformEnum;
 import com.hfkj.sysenum.order.OrderPayTypeEnum;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -62,7 +62,7 @@ public class OrderSettlementServiceImpl implements OrderSettlementService {
                     if (map.get("finishTimeS") == null) {
                         settlementModel.setTime("全时间段");
                     } else {
-                        settlementModel.setTime(map.get("finishTimeS") + "-" + map.get("finishTimeE"));
+                        settlementModel.setTime(DateUtil.date2String(DateUtil.long2Date(MapUtils.getLong(map , "finishTimeS")) , DateUtil.Y_M_D) + "-" + DateUtil.date2String(DateUtil.long2Date(MapUtils.getLong(map , "finishTimeE")) , DateUtil.Y_M_D));
                     }
                     settlementModel.setPayType(key2);
                     settlementModel.setBusinessType(key1);
@@ -97,7 +97,7 @@ public class OrderSettlementServiceImpl implements OrderSettlementService {
                 if (map.get("finishTimeS") == null) {
                     sumModel.setTime("全时间段");
                 } else {
-                    sumModel.setTime(map.get("finishTimeS") + "-" + map.get("finishTimeE"));
+                    sumModel.setTime(DateUtil.date2String(DateUtil.long2Date(MapUtils.getLong(map , "finishTimeS")) , DateUtil.Y_M_D) + "-" + DateUtil.date2String(DateUtil.long2Date(MapUtils.getLong(map , "finishTimeE")) , DateUtil.Y_M_D));
                 }
                 sumModel.setPayType(key2);
                 sumModel.setBusinessType(key1);

service/src/main/resources/dev/commonConfig.properties

@@ -1,4 +1,5 @@
 fileUrl=/home/project/phg/filesystem
+#fileUrl=/Users/chenyao/Desktop/img
 domainName=https://phgcs.dctpay.com
 
 wechatMpAppid=wxa075e8509802f826