解决冲突

bweb/src/main/java/com/bweb/controller/TestController.java

@@ -1,42 +1,24 @@
 package com.bweb.controller;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageInfo;
 import com.hfkj.common.exception.ErrorCode;
 import com.hfkj.common.exception.ErrorHelp;
 import com.hfkj.common.exception.SysCode;
 import com.hfkj.common.utils.*;
-import com.hfkj.entity.*;
+import com.hfkj.config.CommonSysConst;
-import com.hfkj.meituan.MeiTuanService;
+
 import com.hfkj.model.ResponseData;
-import com.hfkj.model.goods.GoodsModel;
+
-import com.hfkj.service.discount.CouponDiscountService;
-import com.hfkj.service.goods.BsOrderGoodsService;
-import com.hfkj.service.goods.GoodsMsgService;
-import com.hfkj.service.goods.GoodsSpecsService;
-import com.hfkj.service.goods.GoodsUserAddressService;
-import com.hfkj.service.hlt.HltCanteenService;
-import com.hfkj.service.hlt.HuiLianTongUnionCardService;
-import com.hfkj.service.order.BsOrderChildService;
-import com.hfkj.service.pay.huift.TradeService;
-import com.hfkj.service.pay.huift.config.HuiftConfig;
-import com.hfkj.sysenum.order.OrderLogisticsStatusEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
+
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
+
 
 @Controller
 @RequestMapping(value="/test")
@@ -138,112 +120,23 @@ public class TestController {
         }
     }
 
-    @RequestMapping(value="/orderGoodsUpdate",method = RequestMethod.GET)
+    @RequestMapping(value="/haiOilLogin",method = RequestMethod.POST)
     @ResponseBody
-    @ApiOperation(value = "商品更新")
+    @ApiOperation(value = "嗨加油登陆参数")
-    public ResponseData orderMsgUpdate() {
+    public ResponseData haiOilLogin(@RequestBody JSONObject body) {
         try {
 
-
+            if (body == null|| StringUtils.isBlank(body.getString("phone"))) {
-            Map<String, Object> map = new HashMap<>();
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
-
-            map.put("status", 1);
-
-            List<GoodsMsg> list = goodsMsgService.getList(map);
-
-            List<GoodsSpecs> specsList = goodsSpecsService.getList(new HashMap<>());
-
-
-            for (GoodsMsg goodsMsg : list) {
-                List<GoodsSpecs> goodsSpecsList = specsList.stream().filter(s -> s.getGoodsId().equals(goodsMsg.getId())).collect(Collectors.toList());
-                if (!goodsSpecsList.isEmpty()) {
-                    goodsMsg.setSaleNum(CommonUtil.saleNumRandom(goodsSpecsList.get(0).getSalePrice()));
-                }
-                goodsMsgService.update(goodsMsg);
             }
 
-            return ResponseMsgUtil.success("成功");
-
-        } catch (Exception e) {
-            log.error("error!",e);
-            return ResponseMsgUtil.exception(e);
-        }
-    }
-
-    @RequestMapping(value="/orderGoodsConfirmReceipt",method = RequestMethod.GET)
-    @ResponseBody
-    @ApiOperation(value = "商品确认收货")
-    public ResponseData orderGoodsConfirmReceipt() {
-        try {
-
             Map<String , Object> map = new HashMap<>();
+            map.put("appid" , CommonSysConst.getSysConfig().getHaiOilAppid());
+            map.put("phone" , body.getString("phone"));
+            map.put("sign" , SignatureUtil.createSign(map , CommonSysConst.getSysConfig().getHaiOilAppSecret()));
 
-            map.put("logisticsStatus" , "SIGN");
-            map.put("status" , 2);
-
-            List<BsOrderGoods> orderGoodsList = orderGoodsService.getList(map);
-
-            for (BsOrderGoods goods : orderGoodsList) {
-
-                // 判断时间是否是十天前
-
-                if (DateUtil.differentDays(goods.getCreateTime() , new Date()) > 9) {
-                    bsOrderGoodsService.confirmReceipt(goods.getId());
-                    goods.setStatus(3);
-                    goods.setUpdateTime(new Date());
-                    orderGoodsService.update(goods);
-                }
-            }
-
-            return ResponseMsgUtil.success("成功");
-
-        } catch (Exception e) {
-            log.error("error!",e);
-            return ResponseMsgUtil.exception(e);
-        }
-    }
-
-    @RequestMapping(value="/getLogisticsMsg",method = RequestMethod.GET)
-    @ResponseBody
-    @ApiOperation(value = "查询物流")
-    public ResponseData getLogisticsMsg() {
-        try {
-            Map<String , Object> objectMap = new HashMap<>();
-
-            objectMap.put("status" , 2);
-
-            List<BsOrderGoods> orderGoodsList = orderGoodsService.getList(objectMap);
-
-            for (BsOrderGoods goods : orderGoodsList) {
-
-                if (goods == null) {
-                    throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息！");
-                }
-
-                GoodsUserAddress userAddress = addressService.queryDetail(goods.getDeliveryAddressId());
-
-                if (userAddress == null) {
-                    throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息！");
-                }
-
-                if (goods.getLogisticsNo() != null) {
-                    GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(goods.getLogisticsNo() , userAddress.getPhone());
-                    if (logistics.getLogisticsStatus() != null) {
-                        goods.setLogisticsStatus(logistics.getLogisticsStatus());
-                        goods.setLogisticsStatusDesc(logistics.getLogisticsStatusDesc());
-                    } else {
-                        goods.setLogisticsStatus(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getCode());
-                        goods.setLogisticsStatusDesc(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getName());
-                    }
-
-                    goods.setUpdateTime(new Date());
 
-                    bsOrderGoodsService.update(goods);
+            return ResponseMsgUtil.success(map);
-                }
-
-            }
-
-            return ResponseMsgUtil.success("map");
 
         } catch (Exception e) {
             log.error("error!",e);
@@ -251,89 +144,4 @@ public class TestController {
         }
     }
 
-
-    @RequestMapping(value = "/getHuiLianTongCardConsume", method = RequestMethod.GET)
-    @ResponseBody
-    @ApiOperation(value = "查询汇联通工会卡消费记录")
-    public ResponseData getHuiLianTongCardConsume(@RequestParam(name = "businessType", required = true) String businessType,
-                                                  @RequestParam(name = "cardNo", required = true) String cardNo) {
-        try {
-
-
-            JSONObject consumptionRecord = HuiLianTongUnionCardService.queryConsumptionRecordByBusiness(businessType, cardNo, 1661498490000L, 1882423290000L, 1, 10000);
-            if (StringUtils.isBlank(consumptionRecord.getString("data"))) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "");
-            }
-
-            JSONArray array = HuiLianTongUnionCardService.resolveResponse(consumptionRecord.getString("data")).getJSONArray(
-                    "records");
-
-            return ResponseMsgUtil.success(array);
-
-        } catch (Exception e) {
-            log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e);
-            return ResponseMsgUtil.exception(e);
-        }
-    }
-
-    @RequestMapping(value = "/queryTransJournal", method = RequestMethod.GET)
-    @ResponseBody
-    @ApiOperation(value = "查询汇联通工会卡消费记录")
-    public ResponseData queryTransJournal(@RequestParam(name = "tranType", required = true) String tranType,
-                                          @RequestParam(name = "cardNo", required = true) String cardNo,
-                                          @RequestParam(value = "pageNum" , required = true) Integer pageNum,
-                                          @RequestParam(value = "pageSize" , required = true) Integer pageSize) {
-        try {
-
-
-            JSONObject consumptionRecord = HuiLianTongUnionCardService.queryTransJournal(cardNo , tranType);
-            if (StringUtils.isBlank(consumptionRecord.getString("data"))) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "");
-            }
-
-            JSONArray array = HuiLianTongUnionCardService.resolveResponse(consumptionRecord.getString("data")).getJSONArray(
-                    "journals");
-
-            List<JSONObject> list = new ArrayList<>();
-
-            for (Object object : array) {
-                JSONObject journal = (JSONObject) object;
-                journal.put("tranAmount", journal.getBigDecimal("tranAmount").divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP));
-                list.add(journal);
-            }
-
-            return ResponseMsgUtil.success(PageUtil.initPageInfoObj(pageNum, list.size(), pageSize, new PageInfo<>(list)));
-
-        } catch (Exception e) {
-            log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e);
-            return ResponseMsgUtil.exception(e);
-        }
-    }
-
-    @RequestMapping(value = "/loginFree", method = RequestMethod.GET)
-    @ResponseBody
-    @ApiOperation(value = "H5免登接口")
-    public ResponseData loginFree(@RequestParam(name = "staffPhone", required = true) String staffPhone,
-                                          @RequestParam(name = "productType", required = true) String productType) {
-        try {
-
-            Map<String , Object> map = new HashMap<>();
-            Map<String , Object> staffInfo = new HashMap<>();
-
-            staffInfo.put("staffPhone", staffPhone);
-
-            map.put("staffInfo", staffInfo);
-            map.put("ts", new Date().getTime());
-            map.put("entId", 104310L);
-            map.put("productType", productType);
-            map.put("nonce" , RandomStringGeneratorUtil.generateRandomString(36));
-            return ResponseMsgUtil.success(MeiTuanService.loginFree(map));
-
-        } catch (Exception e) {
-            log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e);
-            return ResponseMsgUtil.exception(e);
-        }
-    }
-
-
 }

cweb/src/main/java/com/cweb/controller/goods/GoodsController.java

@@ -208,6 +208,8 @@ public class GoodsController {
                 goodsModelSpecs.add(goodsModelSpec);
             }
 
+            goodsModelSpecs = goodsModelSpecs.stream().sorted(Comparator.comparing(GoodsModelSpecs::getSalePrice)).collect(Collectors.toList());
+
             goodsModel.setGoodsModelSpecs(goodsModelSpecs);
 
             return ResponseMsgUtil.success(goodsModel);

order/pom.xml

@@ -18,6 +18,13 @@
             <artifactId>service</artifactId>
             <version>PACKT-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>meituan.skd</groupId>
+            <artifactId>meituan-open-sdk</artifactId>
+            <scope>system</scope>
+            <version>1.0.21</version>
+            <systemPath>${basedir}/lib/open-platform-sdk-1.0.21.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>

order/src/main/java/com/order/controller/OrderController.java

@@ -289,8 +289,9 @@ public class OrderController {
             }
 
             BsOrderChild bsOrderChild = orderChildService.getDetail(body.getString("childOrderNo"));
+            BsOrderGoods orderGoods = orderGoodsService.findGoodsOrderByChild(bsOrderChild.getChildOrderNo());
 
-            if (bsOrderChild.getStatus() != OrderChildStatusEnum.status2.getCode()) {
+            if (orderGoods.getExt3() != null) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前状态不可完成激活！");
             }
             // 子订单完成
@@ -299,14 +300,15 @@ public class OrderController {
             // 赠送优惠券包
             GoodsSpecs goodsSpecs = goodsSpecsService.queryDetailByGoodsId(bsOrderChild.getProductSpecId());
 
-            BsOrderGoods orderGoods = orderGoodsService.findGoodsOrderByChild(bsOrderChild.getChildOrderNo());
-
             Map<String , Object> map = new HashMap<>();
             map.put("discountPkNo" , goodsSpecs.getExt1());
             map.put("number" , bsOrderChild.getProductCount());
             map.put("phone" , orderGoods.getUserPhone());
             HaiOilService.pushPk(map);
 
+            orderGoods.setExt3("已赠送");
+            orderGoodsService.update(orderGoods);
+
             return ResponseMsgUtil.success("操作成功");
 
         } catch (Exception e) {
@@ -326,7 +328,7 @@ public class OrderController {
             }
 
             Map<String , Object> map = new HashMap<>();
-            map.put("appId" , CommonSysConst.getSysConfig().getHaiOilAppid());
+            map.put("appid" , CommonSysConst.getSysConfig().getHaiOilAppid());
             map.put("phone" , body.getString("phone"));
             map.put("sign" , SignatureUtil.createSign(map , CommonSysConst.getSysConfig().getHaiOilAppSecret()));
 

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

@@ -39,7 +39,6 @@ public class BsOrderCinemaController {
     @Resource
     private BsOrderCinemaService bsOrderCinemaService;
 
-
     @RequestMapping(value="/getListCinema",method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询列表")

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

@@ -20,6 +20,7 @@ import com.hfkj.model.order.orderExport.OrderGoodsExportModel;
 import com.hfkj.service.file.FileRecordsService;
 import com.hfkj.service.goods.BsOrderGoodsService;
 import com.hfkj.service.goods.GoodsUserAddressService;
+import com.hfkj.service.order.BsOrderAfterSalesApplyService;
 import com.hfkj.service.order.BsOrderService;
 import com.hfkj.sysenum.SecUserObjectTypeEnum;
 import com.hfkj.sysenum.fileRecords.FileRecordsEnum;
@@ -68,6 +69,9 @@ public class BsOrderGoodsController {
     @Resource
     private BsOrderGoodsService orderGoodsService;
 
+    @Resource
+    private BsOrderAfterSalesApplyService bsOrderAfterSalesApplyService;
+
 
     @RequestMapping(value="/getListGoods",method = RequestMethod.GET)
     @ResponseBody
@@ -296,10 +300,21 @@ public class BsOrderGoodsController {
 
             BsOrderGoods goodsOrder = bsOrderGoodsService.queryDetail(body.getId());
 
+
+
+
+
             if (goodsOrder == null) {
                 throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "信息错误！");
             }
 
+            // 查询是否存在退货申请
+            BsOrderAfterSalesApply afterSalesApply = bsOrderAfterSalesApplyService.getDetailByChildOrderNo(goodsOrder.getChildOrderNo());
+
+            if (afterSalesApply != null && afterSalesApply.getStatus().equals(OrderAfterSalesApplyStatusEnum.type1.getCode())) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前订单存在退货申请，不可录入！");
+            }
+
             String logisticsNo = body.getLogisticsNo().replaceAll("\\s+", "");
 
             goodsOrder.setLogisticsNo(logisticsNo);
@@ -335,6 +350,9 @@ public class BsOrderGoodsController {
             if (userAddress == null) {
                 throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息！");
             }
+            if (orderGoods.getLogisticsNo() == null) {
+                throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "待揽收！");
+            }
 
             GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(orderGoods.getLogisticsNo() , userAddress.getPhone());
 

order/src/main/java/com/order/controller/notify/MeiTuanController.java

@@ -0,0 +1,71 @@
+package com.order.controller.notify;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.hfkj.common.exception.ErrorCode;
+import com.hfkj.common.exception.ErrorHelp;
+import com.hfkj.common.exception.SysCode;
+import com.hfkj.config.CommonSysConst;
+import com.hfkj.meituan.MeiTuanService;
+import com.meituan.sqt.utils.EncryptUtil;
+import com.meituan.sqt.utils.JsonUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.util.Objects;
+
+@Controller
+@RequestMapping(value = "/meiTuan")
+@Api(value = "美团通知")
+public class MeiTuanController {
+
+    private static Logger log = LoggerFactory.getLogger(MeiTuanService.class);
+
+    @RequestMapping(value = "/placeOrder", method = RequestMethod.POST)
+    @ApiOperation(value = "下单")
+    @ResponseBody
+    public void placeOrder(@RequestBody JSONObject reqBodyStr, HttpServletRequest request, HttpServletResponse response) {
+        try {
+            log.info("============回调任务Start=============");
+            String accessKey = reqBodyStr.getString("accessKey");
+            String content = reqBodyStr.getString("content");
+            log.info("美团下单-回调参数: {}", reqBodyStr);
+            if (accessKey == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "accessKey错误");
+            }
+            if (!Objects.equals(accessKey, CommonSysConst.getSysConfig().getMtAccessKey())) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "accessKey错误");
+            }
+
+            if (content == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "content错误");
+            }
+
+
+            JSONObject jsonObject = JSONObject.parseObject(EncryptUtil.aesDecrypt(content, CommonSysConst.getSysConfig().getMtSecretKey()));;
+            log.info("美团下单-解密参数: {}", jsonObject);
+
+            log.info("============回调任务End=============");
+
+
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("text/html;charset=utf-8");
+            PrintWriter writer= response.getWriter();
+            writer.write("SUCCESS");
+
+
+        } catch (Exception e) {
+            log.error("WechatPayController --> wechatNotify() error!", e);
+        }
+    }
+}

schedule/src/main/java/com/hfkj/schedule/OrderGoodsSchedule.java

@@ -1,15 +1,15 @@
 package com.hfkj.schedule;
 
-import com.alibaba.fastjson.JSONArray;
 import com.hfkj.common.exception.ErrorCode;
 import com.hfkj.common.exception.ErrorHelp;
 import com.hfkj.common.exception.SysCode;
 import com.hfkj.common.utils.DateUtil;
-import com.hfkj.entity.BsOrderGoods;
+import com.hfkj.entity.*;
-import com.hfkj.entity.GoodsLogistics;
-import com.hfkj.entity.GoodsUserAddress;
 import com.hfkj.service.goods.BsOrderGoodsService;
+import com.hfkj.service.goods.BsOrderStarbucksService;
 import com.hfkj.service.goods.GoodsUserAddressService;
+import com.hfkj.service.order.BsOrderChildService;
+import com.hfkj.service.order.BsOrderService;
 import com.hfkj.sysenum.order.OrderLogisticsStatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,6 +41,15 @@ public class OrderGoodsSchedule {
     @Resource
     private GoodsUserAddressService addressService;
 
+    @Resource
+    private BsOrderStarbucksService orderStarbucksService;
+
+    @Resource
+    private BsOrderChildService orderChildService;
+
+    @Resource
+    private BsOrderService orderService;
+
     //每日凌晨12点5秒执行一次
     @Scheduled(cron = "5 0 0 * * ?")
     public void orderGoodsConfirmReceipt() {
@@ -98,4 +107,29 @@ public class OrderGoodsSchedule {
 
         }
     }
+
+    @Scheduled(cron = "5 0 0 * * ?")
+    public void getStarbucks() {
+        Map<String , Object> objectMap = new HashMap<>();
+
+        objectMap.put("status" , 15);
+
+        List<BsOrderStarbucks> orderStarbucks = orderStarbucksService.getList(objectMap);
+
+        for (BsOrderStarbucks starbucks : orderStarbucks) {
+
+            if (starbucks != null) {
+                // 查询星巴克订单详情
+                BsOrderChild child = orderChildService.getDetail(starbucks.getChildOrderNo());
+                Map<String , Object> orderMap = new HashMap<>();
+                orderMap.put("orderNo" , child.getChannelOrderNo());
+
+                // 子订单完成
+                orderService.childOrderComplete(starbucks.getChildOrderNo());
+
+            }
+
+
+        }
+    }
 }

service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java

@@ -0,0 +1,281 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.BsOrderMeituan;
+import com.hfkj.entity.BsOrderMeituanExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt {
+    @SelectProvider(type=BsOrderMeituanSqlProvider.class, method="countByExample")
+    long countByExample(BsOrderMeituanExample example);
+
+    @DeleteProvider(type=BsOrderMeituanSqlProvider.class, method="deleteByExample")
+    int deleteByExample(BsOrderMeituanExample example);
+
+    @Delete({
+        "delete from bs_order_meituan",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int deleteByPrimaryKey(Long id);
+
+    @Insert({
+        "insert into bs_order_meituan (order_no, child_order_no, ",
+        "trade_no, third_trade_no, ",
+        "sqt_biz_order_id, mer_id, ",
+        "mer_name, user_id, ",
+        "user_phone, first_business_type, ",
+        "second_business_type, ent_id, ",
+        "img, goods_name, ",
+        "trace_id, goods_count, ",
+        "total_price, total_deduction_price, ",
+        "coupon_discount_price, integral_discount_price, ",
+        "platform_code, notify_url, ",
+        "return_url, pay_real_price, ",
+        "ent_pay_amount, trade_amount, ",
+        "business_discount_pay_amount, service_fee_amount, ",
+        "service_price, pay_channel, ",
+        "pay_serial_no, pay_type, ",
+        "`status`, meituan_status, ",
+        "staff_info, business_info, ",
+        "trade_expiring_time, create_time, ",
+        "pay_time, cancel_time, ",
+        "refund_time, finish_time, ",
+        "update_time, exception_status, ",
+        "exception_msg, ext_1, ",
+        "ext_2, ext_3)",
+        "values (#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ",
+        "#{tradeNo,jdbcType=VARCHAR}, #{thirdTradeNo,jdbcType=VARCHAR}, ",
+        "#{sqtBizOrderId,jdbcType=VARCHAR}, #{merId,jdbcType=BIGINT}, ",
+        "#{merName,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ",
+        "#{userPhone,jdbcType=VARCHAR}, #{firstBusinessType,jdbcType=VARCHAR}, ",
+        "#{secondBusinessType,jdbcType=VARCHAR}, #{entId,jdbcType=BIGINT}, ",
+        "#{img,jdbcType=VARCHAR}, #{goodsName,jdbcType=VARCHAR}, ",
+        "#{traceId,jdbcType=VARCHAR}, #{goodsCount,jdbcType=INTEGER}, ",
+        "#{totalPrice,jdbcType=DECIMAL}, #{totalDeductionPrice,jdbcType=DECIMAL}, ",
+        "#{couponDiscountPrice,jdbcType=DECIMAL}, #{integralDiscountPrice,jdbcType=DECIMAL}, ",
+        "#{platformCode,jdbcType=VARCHAR}, #{notifyUrl,jdbcType=VARCHAR}, ",
+        "#{returnUrl,jdbcType=VARCHAR}, #{payRealPrice,jdbcType=DECIMAL}, ",
+        "#{entPayAmount,jdbcType=DECIMAL}, #{tradeAmount,jdbcType=DECIMAL}, ",
+        "#{businessDiscountPayAmount,jdbcType=DECIMAL}, #{serviceFeeAmount,jdbcType=DECIMAL}, ",
+        "#{servicePrice,jdbcType=DECIMAL}, #{payChannel,jdbcType=INTEGER}, ",
+        "#{paySerialNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ",
+        "#{status,jdbcType=INTEGER}, #{meituanStatus,jdbcType=INTEGER}, ",
+        "#{staffInfo,jdbcType=VARCHAR}, #{businessInfo,jdbcType=VARCHAR}, ",
+        "#{tradeExpiringTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ",
+        "#{refundTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ",
+        "#{updateTime,jdbcType=TIMESTAMP}, #{exceptionStatus,jdbcType=BIT}, ",
+        "#{exceptionMsg,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(BsOrderMeituan record);
+
+    @InsertProvider(type=BsOrderMeituanSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(BsOrderMeituan record);
+
+    @SelectProvider(type=BsOrderMeituanSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="trade_no", property="tradeNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="third_trade_no", property="thirdTradeNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="sqt_biz_order_id", property="sqtBizOrderId", jdbcType=JdbcType.VARCHAR),
+        @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT),
+        @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
+        @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
+        @Result(column="first_business_type", property="firstBusinessType", jdbcType=JdbcType.VARCHAR),
+        @Result(column="second_business_type", property="secondBusinessType", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ent_id", property="entId", jdbcType=JdbcType.BIGINT),
+        @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="trace_id", property="traceId", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
+        @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="coupon_discount_price", property="couponDiscountPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="integral_discount_price", property="integralDiscountPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
+        @Result(column="notify_url", property="notifyUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="return_url", property="returnUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="ent_pay_amount", property="entPayAmount", jdbcType=JdbcType.DECIMAL),
+        @Result(column="trade_amount", property="tradeAmount", jdbcType=JdbcType.DECIMAL),
+        @Result(column="business_discount_pay_amount", property="businessDiscountPayAmount", jdbcType=JdbcType.DECIMAL),
+        @Result(column="service_fee_amount", property="serviceFeeAmount", jdbcType=JdbcType.DECIMAL),
+        @Result(column="service_price", property="servicePrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER),
+        @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="meituan_status", property="meituanStatus", jdbcType=JdbcType.INTEGER),
+        @Result(column="staff_info", property="staffInfo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="business_info", property="businessInfo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="trade_expiring_time", property="tradeExpiringTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="exception_status", property="exceptionStatus", jdbcType=JdbcType.BIT),
+        @Result(column="exception_msg", property="exceptionMsg", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    List<BsOrderMeituan> selectByExample(BsOrderMeituanExample example);
+
+    @Select({
+        "select",
+        "id, order_no, child_order_no, trade_no, third_trade_no, sqt_biz_order_id, mer_id, ",
+        "mer_name, user_id, user_phone, first_business_type, second_business_type, ent_id, ",
+        "img, goods_name, trace_id, goods_count, total_price, total_deduction_price, ",
+        "coupon_discount_price, integral_discount_price, platform_code, notify_url, return_url, ",
+        "pay_real_price, ent_pay_amount, trade_amount, business_discount_pay_amount, ",
+        "service_fee_amount, service_price, pay_channel, pay_serial_no, pay_type, `status`, ",
+        "meituan_status, staff_info, business_info, trade_expiring_time, create_time, ",
+        "pay_time, cancel_time, refund_time, finish_time, update_time, exception_status, ",
+        "exception_msg, ext_1, ext_2, ext_3",
+        "from bs_order_meituan",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="trade_no", property="tradeNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="third_trade_no", property="thirdTradeNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="sqt_biz_order_id", property="sqtBizOrderId", jdbcType=JdbcType.VARCHAR),
+        @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT),
+        @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
+        @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
+        @Result(column="first_business_type", property="firstBusinessType", jdbcType=JdbcType.VARCHAR),
+        @Result(column="second_business_type", property="secondBusinessType", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ent_id", property="entId", jdbcType=JdbcType.BIGINT),
+        @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="trace_id", property="traceId", jdbcType=JdbcType.VARCHAR),
+        @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
+        @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="coupon_discount_price", property="couponDiscountPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="integral_discount_price", property="integralDiscountPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
+        @Result(column="notify_url", property="notifyUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="return_url", property="returnUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="ent_pay_amount", property="entPayAmount", jdbcType=JdbcType.DECIMAL),
+        @Result(column="trade_amount", property="tradeAmount", jdbcType=JdbcType.DECIMAL),
+        @Result(column="business_discount_pay_amount", property="businessDiscountPayAmount", jdbcType=JdbcType.DECIMAL),
+        @Result(column="service_fee_amount", property="serviceFeeAmount", jdbcType=JdbcType.DECIMAL),
+        @Result(column="service_price", property="servicePrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER),
+        @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="meituan_status", property="meituanStatus", jdbcType=JdbcType.INTEGER),
+        @Result(column="staff_info", property="staffInfo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="business_info", property="businessInfo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="trade_expiring_time", property="tradeExpiringTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="exception_status", property="exceptionStatus", jdbcType=JdbcType.BIT),
+        @Result(column="exception_msg", property="exceptionMsg", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    BsOrderMeituan selectByPrimaryKey(Long id);
+
+    @UpdateProvider(type=BsOrderMeituanSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") BsOrderMeituan record, @Param("example") BsOrderMeituanExample example);
+
+    @UpdateProvider(type=BsOrderMeituanSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") BsOrderMeituan record, @Param("example") BsOrderMeituanExample example);
+
+    @UpdateProvider(type=BsOrderMeituanSqlProvider.class, method="updateByPrimaryKeySelective")
+    int updateByPrimaryKeySelective(BsOrderMeituan record);
+
+    @Update({
+        "update bs_order_meituan",
+        "set order_no = #{orderNo,jdbcType=VARCHAR},",
+          "child_order_no = #{childOrderNo,jdbcType=VARCHAR},",
+          "trade_no = #{tradeNo,jdbcType=VARCHAR},",
+          "third_trade_no = #{thirdTradeNo,jdbcType=VARCHAR},",
+          "sqt_biz_order_id = #{sqtBizOrderId,jdbcType=VARCHAR},",
+          "mer_id = #{merId,jdbcType=BIGINT},",
+          "mer_name = #{merName,jdbcType=VARCHAR},",
+          "user_id = #{userId,jdbcType=BIGINT},",
+          "user_phone = #{userPhone,jdbcType=VARCHAR},",
+          "first_business_type = #{firstBusinessType,jdbcType=VARCHAR},",
+          "second_business_type = #{secondBusinessType,jdbcType=VARCHAR},",
+          "ent_id = #{entId,jdbcType=BIGINT},",
+          "img = #{img,jdbcType=VARCHAR},",
+          "goods_name = #{goodsName,jdbcType=VARCHAR},",
+          "trace_id = #{traceId,jdbcType=VARCHAR},",
+          "goods_count = #{goodsCount,jdbcType=INTEGER},",
+          "total_price = #{totalPrice,jdbcType=DECIMAL},",
+          "total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL},",
+          "coupon_discount_price = #{couponDiscountPrice,jdbcType=DECIMAL},",
+          "integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL},",
+          "platform_code = #{platformCode,jdbcType=VARCHAR},",
+          "notify_url = #{notifyUrl,jdbcType=VARCHAR},",
+          "return_url = #{returnUrl,jdbcType=VARCHAR},",
+          "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},",
+          "ent_pay_amount = #{entPayAmount,jdbcType=DECIMAL},",
+          "trade_amount = #{tradeAmount,jdbcType=DECIMAL},",
+          "business_discount_pay_amount = #{businessDiscountPayAmount,jdbcType=DECIMAL},",
+          "service_fee_amount = #{serviceFeeAmount,jdbcType=DECIMAL},",
+          "service_price = #{servicePrice,jdbcType=DECIMAL},",
+          "pay_channel = #{payChannel,jdbcType=INTEGER},",
+          "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},",
+          "pay_type = #{payType,jdbcType=INTEGER},",
+          "`status` = #{status,jdbcType=INTEGER},",
+          "meituan_status = #{meituanStatus,jdbcType=INTEGER},",
+          "staff_info = #{staffInfo,jdbcType=VARCHAR},",
+          "business_info = #{businessInfo,jdbcType=VARCHAR},",
+          "trade_expiring_time = #{tradeExpiringTime,jdbcType=TIMESTAMP},",
+          "create_time = #{createTime,jdbcType=TIMESTAMP},",
+          "pay_time = #{payTime,jdbcType=TIMESTAMP},",
+          "cancel_time = #{cancelTime,jdbcType=TIMESTAMP},",
+          "refund_time = #{refundTime,jdbcType=TIMESTAMP},",
+          "finish_time = #{finishTime,jdbcType=TIMESTAMP},",
+          "update_time = #{updateTime,jdbcType=TIMESTAMP},",
+          "exception_status = #{exceptionStatus,jdbcType=BIT},",
+          "exception_msg = #{exceptionMsg,jdbcType=VARCHAR},",
+          "ext_1 = #{ext1,jdbcType=VARCHAR},",
+          "ext_2 = #{ext2,jdbcType=VARCHAR},",
+          "ext_3 = #{ext3,jdbcType=VARCHAR}",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int updateByPrimaryKey(BsOrderMeituan record);
+}

service/src/main/java/com/hfkj/dao/BsOrderMeituanMapperExt.java

@@ -0,0 +1,7 @@
+package com.hfkj.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface BsOrderMeituanMapperExt {
+}

service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java

@@ -0,0 +1,850 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.BsOrderMeituan;
+import com.hfkj.entity.BsOrderMeituanExample.Criteria;
+import com.hfkj.entity.BsOrderMeituanExample.Criterion;
+import com.hfkj.entity.BsOrderMeituanExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class BsOrderMeituanSqlProvider {
+
+    public String countByExample(BsOrderMeituanExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("bs_order_meituan");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(BsOrderMeituanExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("bs_order_meituan");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(BsOrderMeituan record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("bs_order_meituan");
+        
+        if (record.getOrderNo() != null) {
+            sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getChildOrderNo() != null) {
+            sql.VALUES("child_order_no", "#{childOrderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getTradeNo() != null) {
+            sql.VALUES("trade_no", "#{tradeNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getThirdTradeNo() != null) {
+            sql.VALUES("third_trade_no", "#{thirdTradeNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSqtBizOrderId() != null) {
+            sql.VALUES("sqt_biz_order_id", "#{sqtBizOrderId,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getMerId() != null) {
+            sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getMerName() != null) {
+            sql.VALUES("mer_name", "#{merName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getUserId() != null) {
+            sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getUserPhone() != null) {
+            sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getFirstBusinessType() != null) {
+            sql.VALUES("first_business_type", "#{firstBusinessType,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSecondBusinessType() != null) {
+            sql.VALUES("second_business_type", "#{secondBusinessType,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getEntId() != null) {
+            sql.VALUES("ent_id", "#{entId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getImg() != null) {
+            sql.VALUES("img", "#{img,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsName() != null) {
+            sql.VALUES("goods_name", "#{goodsName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getTraceId() != null) {
+            sql.VALUES("trace_id", "#{traceId,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsCount() != null) {
+            sql.VALUES("goods_count", "#{goodsCount,jdbcType=INTEGER}");
+        }
+        
+        if (record.getTotalPrice() != null) {
+            sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTotalDeductionPrice() != null) {
+            sql.VALUES("total_deduction_price", "#{totalDeductionPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCouponDiscountPrice() != null) {
+            sql.VALUES("coupon_discount_price", "#{couponDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getIntegralDiscountPrice() != null) {
+            sql.VALUES("integral_discount_price", "#{integralDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPlatformCode() != null) {
+            sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getNotifyUrl() != null) {
+            sql.VALUES("notify_url", "#{notifyUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getReturnUrl() != null) {
+            sql.VALUES("return_url", "#{returnUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPayRealPrice() != null) {
+            sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getEntPayAmount() != null) {
+            sql.VALUES("ent_pay_amount", "#{entPayAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTradeAmount() != null) {
+            sql.VALUES("trade_amount", "#{tradeAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getBusinessDiscountPayAmount() != null) {
+            sql.VALUES("business_discount_pay_amount", "#{businessDiscountPayAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getServiceFeeAmount() != null) {
+            sql.VALUES("service_fee_amount", "#{serviceFeeAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getServicePrice() != null) {
+            sql.VALUES("service_price", "#{servicePrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPayChannel() != null) {
+            sql.VALUES("pay_channel", "#{payChannel,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPaySerialNo() != null) {
+            sql.VALUES("pay_serial_no", "#{paySerialNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPayType() != null) {
+            sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getMeituanStatus() != null) {
+            sql.VALUES("meituan_status", "#{meituanStatus,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStaffInfo() != null) {
+            sql.VALUES("staff_info", "#{staffInfo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getBusinessInfo() != null) {
+            sql.VALUES("business_info", "#{businessInfo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getTradeExpiringTime() != null) {
+            sql.VALUES("trade_expiring_time", "#{tradeExpiringTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getPayTime() != null) {
+            sql.VALUES("pay_time", "#{payTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCancelTime() != null) {
+            sql.VALUES("cancel_time", "#{cancelTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getRefundTime() != null) {
+            sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getFinishTime() != null) {
+            sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getExceptionStatus() != null) {
+            sql.VALUES("exception_status", "#{exceptionStatus,jdbcType=BIT}");
+        }
+        
+        if (record.getExceptionMsg() != null) {
+            sql.VALUES("exception_msg", "#{exceptionMsg,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(BsOrderMeituanExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("order_no");
+        sql.SELECT("child_order_no");
+        sql.SELECT("trade_no");
+        sql.SELECT("third_trade_no");
+        sql.SELECT("sqt_biz_order_id");
+        sql.SELECT("mer_id");
+        sql.SELECT("mer_name");
+        sql.SELECT("user_id");
+        sql.SELECT("user_phone");
+        sql.SELECT("first_business_type");
+        sql.SELECT("second_business_type");
+        sql.SELECT("ent_id");
+        sql.SELECT("img");
+        sql.SELECT("goods_name");
+        sql.SELECT("trace_id");
+        sql.SELECT("goods_count");
+        sql.SELECT("total_price");
+        sql.SELECT("total_deduction_price");
+        sql.SELECT("coupon_discount_price");
+        sql.SELECT("integral_discount_price");
+        sql.SELECT("platform_code");
+        sql.SELECT("notify_url");
+        sql.SELECT("return_url");
+        sql.SELECT("pay_real_price");
+        sql.SELECT("ent_pay_amount");
+        sql.SELECT("trade_amount");
+        sql.SELECT("business_discount_pay_amount");
+        sql.SELECT("service_fee_amount");
+        sql.SELECT("service_price");
+        sql.SELECT("pay_channel");
+        sql.SELECT("pay_serial_no");
+        sql.SELECT("pay_type");
+        sql.SELECT("`status`");
+        sql.SELECT("meituan_status");
+        sql.SELECT("staff_info");
+        sql.SELECT("business_info");
+        sql.SELECT("trade_expiring_time");
+        sql.SELECT("create_time");
+        sql.SELECT("pay_time");
+        sql.SELECT("cancel_time");
+        sql.SELECT("refund_time");
+        sql.SELECT("finish_time");
+        sql.SELECT("update_time");
+        sql.SELECT("exception_status");
+        sql.SELECT("exception_msg");
+        sql.SELECT("ext_1");
+        sql.SELECT("ext_2");
+        sql.SELECT("ext_3");
+        sql.FROM("bs_order_meituan");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        BsOrderMeituan record = (BsOrderMeituan) parameter.get("record");
+        BsOrderMeituanExample example = (BsOrderMeituanExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("bs_order_meituan");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOrderNo() != null) {
+            sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getChildOrderNo() != null) {
+            sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getTradeNo() != null) {
+            sql.SET("trade_no = #{record.tradeNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getThirdTradeNo() != null) {
+            sql.SET("third_trade_no = #{record.thirdTradeNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSqtBizOrderId() != null) {
+            sql.SET("sqt_biz_order_id = #{record.sqtBizOrderId,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getMerId() != null) {
+            sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getMerName() != null) {
+            sql.SET("mer_name = #{record.merName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getUserId() != null) {
+            sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getUserPhone() != null) {
+            sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getFirstBusinessType() != null) {
+            sql.SET("first_business_type = #{record.firstBusinessType,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSecondBusinessType() != null) {
+            sql.SET("second_business_type = #{record.secondBusinessType,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getEntId() != null) {
+            sql.SET("ent_id = #{record.entId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getImg() != null) {
+            sql.SET("img = #{record.img,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsName() != null) {
+            sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getTraceId() != null) {
+            sql.SET("trace_id = #{record.traceId,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsCount() != null) {
+            sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
+        }
+        
+        if (record.getTotalPrice() != null) {
+            sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTotalDeductionPrice() != null) {
+            sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCouponDiscountPrice() != null) {
+            sql.SET("coupon_discount_price = #{record.couponDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getIntegralDiscountPrice() != null) {
+            sql.SET("integral_discount_price = #{record.integralDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPlatformCode() != null) {
+            sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getNotifyUrl() != null) {
+            sql.SET("notify_url = #{record.notifyUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getReturnUrl() != null) {
+            sql.SET("return_url = #{record.returnUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPayRealPrice() != null) {
+            sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getEntPayAmount() != null) {
+            sql.SET("ent_pay_amount = #{record.entPayAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTradeAmount() != null) {
+            sql.SET("trade_amount = #{record.tradeAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getBusinessDiscountPayAmount() != null) {
+            sql.SET("business_discount_pay_amount = #{record.businessDiscountPayAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getServiceFeeAmount() != null) {
+            sql.SET("service_fee_amount = #{record.serviceFeeAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getServicePrice() != null) {
+            sql.SET("service_price = #{record.servicePrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPayChannel() != null) {
+            sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPaySerialNo() != null) {
+            sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPayType() != null) {
+            sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getMeituanStatus() != null) {
+            sql.SET("meituan_status = #{record.meituanStatus,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStaffInfo() != null) {
+            sql.SET("staff_info = #{record.staffInfo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getBusinessInfo() != null) {
+            sql.SET("business_info = #{record.businessInfo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getTradeExpiringTime() != null) {
+            sql.SET("trade_expiring_time = #{record.tradeExpiringTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getPayTime() != null) {
+            sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCancelTime() != null) {
+            sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getRefundTime() != null) {
+            sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getFinishTime() != null) {
+            sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getExceptionStatus() != null) {
+            sql.SET("exception_status = #{record.exceptionStatus,jdbcType=BIT}");
+        }
+        
+        if (record.getExceptionMsg() != null) {
+            sql.SET("exception_msg = #{record.exceptionMsg,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("bs_order_meituan");
+        
+        sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
+        sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}");
+        sql.SET("trade_no = #{record.tradeNo,jdbcType=VARCHAR}");
+        sql.SET("third_trade_no = #{record.thirdTradeNo,jdbcType=VARCHAR}");
+        sql.SET("sqt_biz_order_id = #{record.sqtBizOrderId,jdbcType=VARCHAR}");
+        sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}");
+        sql.SET("mer_name = #{record.merName,jdbcType=VARCHAR}");
+        sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
+        sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}");
+        sql.SET("first_business_type = #{record.firstBusinessType,jdbcType=VARCHAR}");
+        sql.SET("second_business_type = #{record.secondBusinessType,jdbcType=VARCHAR}");
+        sql.SET("ent_id = #{record.entId,jdbcType=BIGINT}");
+        sql.SET("img = #{record.img,jdbcType=VARCHAR}");
+        sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
+        sql.SET("trace_id = #{record.traceId,jdbcType=VARCHAR}");
+        sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
+        sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
+        sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}");
+        sql.SET("coupon_discount_price = #{record.couponDiscountPrice,jdbcType=DECIMAL}");
+        sql.SET("integral_discount_price = #{record.integralDiscountPrice,jdbcType=DECIMAL}");
+        sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
+        sql.SET("notify_url = #{record.notifyUrl,jdbcType=VARCHAR}");
+        sql.SET("return_url = #{record.returnUrl,jdbcType=VARCHAR}");
+        sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}");
+        sql.SET("ent_pay_amount = #{record.entPayAmount,jdbcType=DECIMAL}");
+        sql.SET("trade_amount = #{record.tradeAmount,jdbcType=DECIMAL}");
+        sql.SET("business_discount_pay_amount = #{record.businessDiscountPayAmount,jdbcType=DECIMAL}");
+        sql.SET("service_fee_amount = #{record.serviceFeeAmount,jdbcType=DECIMAL}");
+        sql.SET("service_price = #{record.servicePrice,jdbcType=DECIMAL}");
+        sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}");
+        sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}");
+        sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        sql.SET("meituan_status = #{record.meituanStatus,jdbcType=INTEGER}");
+        sql.SET("staff_info = #{record.staffInfo,jdbcType=VARCHAR}");
+        sql.SET("business_info = #{record.businessInfo,jdbcType=VARCHAR}");
+        sql.SET("trade_expiring_time = #{record.tradeExpiringTime,jdbcType=TIMESTAMP}");
+        sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}");
+        sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}");
+        sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
+        sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
+        sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        sql.SET("exception_status = #{record.exceptionStatus,jdbcType=BIT}");
+        sql.SET("exception_msg = #{record.exceptionMsg,jdbcType=VARCHAR}");
+        sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        
+        BsOrderMeituanExample example = (BsOrderMeituanExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByPrimaryKeySelective(BsOrderMeituan record) {
+        SQL sql = new SQL();
+        sql.UPDATE("bs_order_meituan");
+        
+        if (record.getOrderNo() != null) {
+            sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getChildOrderNo() != null) {
+            sql.SET("child_order_no = #{childOrderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getTradeNo() != null) {
+            sql.SET("trade_no = #{tradeNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getThirdTradeNo() != null) {
+            sql.SET("third_trade_no = #{thirdTradeNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSqtBizOrderId() != null) {
+            sql.SET("sqt_biz_order_id = #{sqtBizOrderId,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getMerId() != null) {
+            sql.SET("mer_id = #{merId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getMerName() != null) {
+            sql.SET("mer_name = #{merName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getUserId() != null) {
+            sql.SET("user_id = #{userId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getUserPhone() != null) {
+            sql.SET("user_phone = #{userPhone,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getFirstBusinessType() != null) {
+            sql.SET("first_business_type = #{firstBusinessType,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getSecondBusinessType() != null) {
+            sql.SET("second_business_type = #{secondBusinessType,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getEntId() != null) {
+            sql.SET("ent_id = #{entId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getImg() != null) {
+            sql.SET("img = #{img,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsName() != null) {
+            sql.SET("goods_name = #{goodsName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getTraceId() != null) {
+            sql.SET("trace_id = #{traceId,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGoodsCount() != null) {
+            sql.SET("goods_count = #{goodsCount,jdbcType=INTEGER}");
+        }
+        
+        if (record.getTotalPrice() != null) {
+            sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTotalDeductionPrice() != null) {
+            sql.SET("total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCouponDiscountPrice() != null) {
+            sql.SET("coupon_discount_price = #{couponDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getIntegralDiscountPrice() != null) {
+            sql.SET("integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPlatformCode() != null) {
+            sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getNotifyUrl() != null) {
+            sql.SET("notify_url = #{notifyUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getReturnUrl() != null) {
+            sql.SET("return_url = #{returnUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPayRealPrice() != null) {
+            sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getEntPayAmount() != null) {
+            sql.SET("ent_pay_amount = #{entPayAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTradeAmount() != null) {
+            sql.SET("trade_amount = #{tradeAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getBusinessDiscountPayAmount() != null) {
+            sql.SET("business_discount_pay_amount = #{businessDiscountPayAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getServiceFeeAmount() != null) {
+            sql.SET("service_fee_amount = #{serviceFeeAmount,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getServicePrice() != null) {
+            sql.SET("service_price = #{servicePrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getPayChannel() != null) {
+            sql.SET("pay_channel = #{payChannel,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPaySerialNo() != null) {
+            sql.SET("pay_serial_no = #{paySerialNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPayType() != null) {
+            sql.SET("pay_type = #{payType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getMeituanStatus() != null) {
+            sql.SET("meituan_status = #{meituanStatus,jdbcType=INTEGER}");
+        }
+        
+        if (record.getStaffInfo() != null) {
+            sql.SET("staff_info = #{staffInfo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getBusinessInfo() != null) {
+            sql.SET("business_info = #{businessInfo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getTradeExpiringTime() != null) {
+            sql.SET("trade_expiring_time = #{tradeExpiringTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getPayTime() != null) {
+            sql.SET("pay_time = #{payTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCancelTime() != null) {
+            sql.SET("cancel_time = #{cancelTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getRefundTime() != null) {
+            sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getFinishTime() != null) {
+            sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getExceptionStatus() != null) {
+            sql.SET("exception_status = #{exceptionStatus,jdbcType=BIT}");
+        }
+        
+        if (record.getExceptionMsg() != null) {
+            sql.SET("exception_msg = #{exceptionMsg,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
+        }
+        
+        sql.WHERE("id = #{id,jdbcType=BIGINT}");
+        
+        return sql.toString();
+    }
+
+    protected void applyWhere(SQL sql, BsOrderMeituanExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

service/src/main/java/com/hfkj/entity/BsOrderMeituan.java

@@ -0,0 +1,835 @@
+package com.hfkj.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * bs_order_meituan
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class BsOrderMeituan implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 交易订单号
+     */
+    private String orderNo;
+
+    /**
+     * 子订单号
+     */
+    private String childOrderNo;
+
+    /**
+     * 交易号，每笔支付的唯一标识，需要以此字段做幂等处理
+     */
+    private String tradeNo;
+
+    /**
+     * 业务交易号，每笔支付的唯一标识，需要以此字段做幂等处理
+     */
+    private String thirdTradeNo;
+
+    /**
+     * 美团企业版订单号
+     */
+    private String sqtBizOrderId;
+
+    /**
+     * 商户id
+     */
+    private Long merId;
+
+    /**
+     * 商户名称
+     */
+    private String merName;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户手机号
+     */
+    private String userPhone;
+
+    /**
+     * 一级业务类型编码
+     */
+    private String firstBusinessType;
+
+    /**
+     * 二级业务类型编码
+     */
+    private String secondBusinessType;
+
+    /**
+     * 商品id
+     */
+    private Long entId;
+
+    /**
+     * 图片
+     */
+    private String img;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 日志查询 ID
+     */
+    private String traceId;
+
+    /**
+     * 商品数量
+     */
+    private Integer goodsCount;
+
+    /**
+     * 交易金额
+     */
+    private BigDecimal totalPrice;
+
+    /**
+     * 总优惠金额（优惠券优惠金额 + 积分抵扣）
+     */
+    private BigDecimal totalDeductionPrice;
+
+    /**
+     * 优惠券优惠金额
+     */
+    private BigDecimal couponDiscountPrice;
+
+    /**
+     * 积分抵扣优惠金额
+     */
+    private Long integralDiscountPrice;
+
+    /**
+     * 登录平台code
+     */
+    private String platformCode;
+
+    /**
+     * 支付成功通知地址：客户平台支付成功时，后台发 POST 请求，通知美团企业版支付成功的调用地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 支付成功跳转地址：客户平台支付成功时，前端重定向地址，通常是订单详情页
+     */
+    private String returnUrl;
+
+    /**
+     * 实付金额
+     */
+    private BigDecimal payRealPrice;
+
+    /**
+     * 企业待支付金额（不含服务费），单位元
+     */
+    private BigDecimal entPayAmount;
+
+    /**
+     * 支付金额(不包含服务费)，单位元，支持小数点后两位
+     */
+    private BigDecimal tradeAmount;
+
+    /**
+     * 优惠承担支付金额，单位元；NULL 代表无优惠承担金额
+     */
+    private BigDecimal businessDiscountPayAmount;
+
+    /**
+     * 随单服务费（空值表示没有服务费），单位元，支持小数点后两位
+     */
+    private BigDecimal serviceFeeAmount;
+
+    /**
+     * 平台服务费
+     */
+    private BigDecimal servicePrice;
+
+    /**
+     * 支付渠道与bs_order订单表同步
+     */
+    private Integer payChannel;
+
+    /**
+     * 客户支付流水号
+     */
+    private String paySerialNo;
+
+    /**
+     * 支付方式与bs_order订单表同步
+     */
+    private Integer payType;
+
+    /**
+     * 订单状态：
+1. 待支付
+2. 已支付
+3. 已完成
+4. 已退款
+5. 已取消
+6. 退款中
+     */
+    private Integer status;
+
+    /**
+     * 支付状态
+0 待支付
+1 支付成功
+2 支付失败
+10 支付超时关单
+     */
+    private Integer meituanStatus;
+
+    /**
+     * 员工信息
+     */
+    private String staffInfo;
+
+    /**
+     * 业务信息字段，为各品类（一级业务类型编码）业务信息 JSON 序列化后的字符串
+     */
+    private String businessInfo;
+
+    /**
+     * 交易关单时间，格式 yyyy-MM-dd hh:mm:ss，超过关单时间后客户平台不应再允许用户支付成功或通知美团企业版交易支付成功
+     */
+    private Date tradeExpiringTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+
+    /**
+     * 取消时间
+     */
+    private Date cancelTime;
+
+    /**
+     * 退款时间
+     */
+    private Date refundTime;
+
+    /**
+     * 完成时间
+     */
+    private Date finishTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 异常状态  0：正常  1：异常
+     */
+    private Boolean exceptionStatus;
+
+    /**
+     * 异常内容
+     */
+    private String exceptionMsg;
+
+    private String ext1;
+
+    private String ext2;
+
+    private String ext3;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getChildOrderNo() {
+        return childOrderNo;
+    }
+
+    public void setChildOrderNo(String childOrderNo) {
+        this.childOrderNo = childOrderNo;
+    }
+
+    public String getTradeNo() {
+        return tradeNo;
+    }
+
+    public void setTradeNo(String tradeNo) {
+        this.tradeNo = tradeNo;
+    }
+
+    public String getThirdTradeNo() {
+        return thirdTradeNo;
+    }
+
+    public void setThirdTradeNo(String thirdTradeNo) {
+        this.thirdTradeNo = thirdTradeNo;
+    }
+
+    public String getSqtBizOrderId() {
+        return sqtBizOrderId;
+    }
+
+    public void setSqtBizOrderId(String sqtBizOrderId) {
+        this.sqtBizOrderId = sqtBizOrderId;
+    }
+
+    public Long getMerId() {
+        return merId;
+    }
+
+    public void setMerId(Long merId) {
+        this.merId = merId;
+    }
+
+    public String getMerName() {
+        return merName;
+    }
+
+    public void setMerName(String merName) {
+        this.merName = merName;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    public String getFirstBusinessType() {
+        return firstBusinessType;
+    }
+
+    public void setFirstBusinessType(String firstBusinessType) {
+        this.firstBusinessType = firstBusinessType;
+    }
+
+    public String getSecondBusinessType() {
+        return secondBusinessType;
+    }
+
+    public void setSecondBusinessType(String secondBusinessType) {
+        this.secondBusinessType = secondBusinessType;
+    }
+
+    public Long getEntId() {
+        return entId;
+    }
+
+    public void setEntId(Long entId) {
+        this.entId = entId;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public String getTraceId() {
+        return traceId;
+    }
+
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
+    public Integer getGoodsCount() {
+        return goodsCount;
+    }
+
+    public void setGoodsCount(Integer goodsCount) {
+        this.goodsCount = goodsCount;
+    }
+
+    public BigDecimal getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(BigDecimal totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public BigDecimal getTotalDeductionPrice() {
+        return totalDeductionPrice;
+    }
+
+    public void setTotalDeductionPrice(BigDecimal totalDeductionPrice) {
+        this.totalDeductionPrice = totalDeductionPrice;
+    }
+
+    public BigDecimal getCouponDiscountPrice() {
+        return couponDiscountPrice;
+    }
+
+    public void setCouponDiscountPrice(BigDecimal couponDiscountPrice) {
+        this.couponDiscountPrice = couponDiscountPrice;
+    }
+
+    public Long getIntegralDiscountPrice() {
+        return integralDiscountPrice;
+    }
+
+    public void setIntegralDiscountPrice(Long integralDiscountPrice) {
+        this.integralDiscountPrice = integralDiscountPrice;
+    }
+
+    public String getPlatformCode() {
+        return platformCode;
+    }
+
+    public void setPlatformCode(String platformCode) {
+        this.platformCode = platformCode;
+    }
+
+    public String getNotifyUrl() {
+        return notifyUrl;
+    }
+
+    public void setNotifyUrl(String notifyUrl) {
+        this.notifyUrl = notifyUrl;
+    }
+
+    public String getReturnUrl() {
+        return returnUrl;
+    }
+
+    public void setReturnUrl(String returnUrl) {
+        this.returnUrl = returnUrl;
+    }
+
+    public BigDecimal getPayRealPrice() {
+        return payRealPrice;
+    }
+
+    public void setPayRealPrice(BigDecimal payRealPrice) {
+        this.payRealPrice = payRealPrice;
+    }
+
+    public BigDecimal getEntPayAmount() {
+        return entPayAmount;
+    }
+
+    public void setEntPayAmount(BigDecimal entPayAmount) {
+        this.entPayAmount = entPayAmount;
+    }
+
+    public BigDecimal getTradeAmount() {
+        return tradeAmount;
+    }
+
+    public void setTradeAmount(BigDecimal tradeAmount) {
+        this.tradeAmount = tradeAmount;
+    }
+
+    public BigDecimal getBusinessDiscountPayAmount() {
+        return businessDiscountPayAmount;
+    }
+
+    public void setBusinessDiscountPayAmount(BigDecimal businessDiscountPayAmount) {
+        this.businessDiscountPayAmount = businessDiscountPayAmount;
+    }
+
+    public BigDecimal getServiceFeeAmount() {
+        return serviceFeeAmount;
+    }
+
+    public void setServiceFeeAmount(BigDecimal serviceFeeAmount) {
+        this.serviceFeeAmount = serviceFeeAmount;
+    }
+
+    public BigDecimal getServicePrice() {
+        return servicePrice;
+    }
+
+    public void setServicePrice(BigDecimal servicePrice) {
+        this.servicePrice = servicePrice;
+    }
+
+    public Integer getPayChannel() {
+        return payChannel;
+    }
+
+    public void setPayChannel(Integer payChannel) {
+        this.payChannel = payChannel;
+    }
+
+    public String getPaySerialNo() {
+        return paySerialNo;
+    }
+
+    public void setPaySerialNo(String paySerialNo) {
+        this.paySerialNo = paySerialNo;
+    }
+
+    public Integer getPayType() {
+        return payType;
+    }
+
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getMeituanStatus() {
+        return meituanStatus;
+    }
+
+    public void setMeituanStatus(Integer meituanStatus) {
+        this.meituanStatus = meituanStatus;
+    }
+
+    public String getStaffInfo() {
+        return staffInfo;
+    }
+
+    public void setStaffInfo(String staffInfo) {
+        this.staffInfo = staffInfo;
+    }
+
+    public String getBusinessInfo() {
+        return businessInfo;
+    }
+
+    public void setBusinessInfo(String businessInfo) {
+        this.businessInfo = businessInfo;
+    }
+
+    public Date getTradeExpiringTime() {
+        return tradeExpiringTime;
+    }
+
+    public void setTradeExpiringTime(Date tradeExpiringTime) {
+        this.tradeExpiringTime = tradeExpiringTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public Date getCancelTime() {
+        return cancelTime;
+    }
+
+    public void setCancelTime(Date cancelTime) {
+        this.cancelTime = cancelTime;
+    }
+
+    public Date getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(Date refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public Date getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(Date finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Boolean getExceptionStatus() {
+        return exceptionStatus;
+    }
+
+    public void setExceptionStatus(Boolean exceptionStatus) {
+        this.exceptionStatus = exceptionStatus;
+    }
+
+    public String getExceptionMsg() {
+        return exceptionMsg;
+    }
+
+    public void setExceptionMsg(String exceptionMsg) {
+        this.exceptionMsg = exceptionMsg;
+    }
+
+    public String getExt1() {
+        return ext1;
+    }
+
+    public void setExt1(String ext1) {
+        this.ext1 = ext1;
+    }
+
+    public String getExt2() {
+        return ext2;
+    }
+
+    public void setExt2(String ext2) {
+        this.ext2 = ext2;
+    }
+
+    public String getExt3() {
+        return ext3;
+    }
+
+    public void setExt3(String ext3) {
+        this.ext3 = ext3;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        BsOrderMeituan other = (BsOrderMeituan) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
+            && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo()))
+            && (this.getTradeNo() == null ? other.getTradeNo() == null : this.getTradeNo().equals(other.getTradeNo()))
+            && (this.getThirdTradeNo() == null ? other.getThirdTradeNo() == null : this.getThirdTradeNo().equals(other.getThirdTradeNo()))
+            && (this.getSqtBizOrderId() == null ? other.getSqtBizOrderId() == null : this.getSqtBizOrderId().equals(other.getSqtBizOrderId()))
+            && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId()))
+            && (this.getMerName() == null ? other.getMerName() == null : this.getMerName().equals(other.getMerName()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone()))
+            && (this.getFirstBusinessType() == null ? other.getFirstBusinessType() == null : this.getFirstBusinessType().equals(other.getFirstBusinessType()))
+            && (this.getSecondBusinessType() == null ? other.getSecondBusinessType() == null : this.getSecondBusinessType().equals(other.getSecondBusinessType()))
+            && (this.getEntId() == null ? other.getEntId() == null : this.getEntId().equals(other.getEntId()))
+            && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg()))
+            && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName()))
+            && (this.getTraceId() == null ? other.getTraceId() == null : this.getTraceId().equals(other.getTraceId()))
+            && (this.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount()))
+            && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice()))
+            && (this.getTotalDeductionPrice() == null ? other.getTotalDeductionPrice() == null : this.getTotalDeductionPrice().equals(other.getTotalDeductionPrice()))
+            && (this.getCouponDiscountPrice() == null ? other.getCouponDiscountPrice() == null : this.getCouponDiscountPrice().equals(other.getCouponDiscountPrice()))
+            && (this.getIntegralDiscountPrice() == null ? other.getIntegralDiscountPrice() == null : this.getIntegralDiscountPrice().equals(other.getIntegralDiscountPrice()))
+            && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode()))
+            && (this.getNotifyUrl() == null ? other.getNotifyUrl() == null : this.getNotifyUrl().equals(other.getNotifyUrl()))
+            && (this.getReturnUrl() == null ? other.getReturnUrl() == null : this.getReturnUrl().equals(other.getReturnUrl()))
+            && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice()))
+            && (this.getEntPayAmount() == null ? other.getEntPayAmount() == null : this.getEntPayAmount().equals(other.getEntPayAmount()))
+            && (this.getTradeAmount() == null ? other.getTradeAmount() == null : this.getTradeAmount().equals(other.getTradeAmount()))
+            && (this.getBusinessDiscountPayAmount() == null ? other.getBusinessDiscountPayAmount() == null : this.getBusinessDiscountPayAmount().equals(other.getBusinessDiscountPayAmount()))
+            && (this.getServiceFeeAmount() == null ? other.getServiceFeeAmount() == null : this.getServiceFeeAmount().equals(other.getServiceFeeAmount()))
+            && (this.getServicePrice() == null ? other.getServicePrice() == null : this.getServicePrice().equals(other.getServicePrice()))
+            && (this.getPayChannel() == null ? other.getPayChannel() == null : this.getPayChannel().equals(other.getPayChannel()))
+            && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo()))
+            && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getMeituanStatus() == null ? other.getMeituanStatus() == null : this.getMeituanStatus().equals(other.getMeituanStatus()))
+            && (this.getStaffInfo() == null ? other.getStaffInfo() == null : this.getStaffInfo().equals(other.getStaffInfo()))
+            && (this.getBusinessInfo() == null ? other.getBusinessInfo() == null : this.getBusinessInfo().equals(other.getBusinessInfo()))
+            && (this.getTradeExpiringTime() == null ? other.getTradeExpiringTime() == null : this.getTradeExpiringTime().equals(other.getTradeExpiringTime()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime()))
+            && (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime()))
+            && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
+            && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getExceptionStatus() == null ? other.getExceptionStatus() == null : this.getExceptionStatus().equals(other.getExceptionStatus()))
+            && (this.getExceptionMsg() == null ? other.getExceptionMsg() == null : this.getExceptionMsg().equals(other.getExceptionMsg()))
+            && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
+            && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
+            && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
+        result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode());
+        result = prime * result + ((getTradeNo() == null) ? 0 : getTradeNo().hashCode());
+        result = prime * result + ((getThirdTradeNo() == null) ? 0 : getThirdTradeNo().hashCode());
+        result = prime * result + ((getSqtBizOrderId() == null) ? 0 : getSqtBizOrderId().hashCode());
+        result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode());
+        result = prime * result + ((getMerName() == null) ? 0 : getMerName().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode());
+        result = prime * result + ((getFirstBusinessType() == null) ? 0 : getFirstBusinessType().hashCode());
+        result = prime * result + ((getSecondBusinessType() == null) ? 0 : getSecondBusinessType().hashCode());
+        result = prime * result + ((getEntId() == null) ? 0 : getEntId().hashCode());
+        result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode());
+        result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode());
+        result = prime * result + ((getTraceId() == null) ? 0 : getTraceId().hashCode());
+        result = prime * result + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode());
+        result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode());
+        result = prime * result + ((getTotalDeductionPrice() == null) ? 0 : getTotalDeductionPrice().hashCode());
+        result = prime * result + ((getCouponDiscountPrice() == null) ? 0 : getCouponDiscountPrice().hashCode());
+        result = prime * result + ((getIntegralDiscountPrice() == null) ? 0 : getIntegralDiscountPrice().hashCode());
+        result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode());
+        result = prime * result + ((getNotifyUrl() == null) ? 0 : getNotifyUrl().hashCode());
+        result = prime * result + ((getReturnUrl() == null) ? 0 : getReturnUrl().hashCode());
+        result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode());
+        result = prime * result + ((getEntPayAmount() == null) ? 0 : getEntPayAmount().hashCode());
+        result = prime * result + ((getTradeAmount() == null) ? 0 : getTradeAmount().hashCode());
+        result = prime * result + ((getBusinessDiscountPayAmount() == null) ? 0 : getBusinessDiscountPayAmount().hashCode());
+        result = prime * result + ((getServiceFeeAmount() == null) ? 0 : getServiceFeeAmount().hashCode());
+        result = prime * result + ((getServicePrice() == null) ? 0 : getServicePrice().hashCode());
+        result = prime * result + ((getPayChannel() == null) ? 0 : getPayChannel().hashCode());
+        result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode());
+        result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getMeituanStatus() == null) ? 0 : getMeituanStatus().hashCode());
+        result = prime * result + ((getStaffInfo() == null) ? 0 : getStaffInfo().hashCode());
+        result = prime * result + ((getBusinessInfo() == null) ? 0 : getBusinessInfo().hashCode());
+        result = prime * result + ((getTradeExpiringTime() == null) ? 0 : getTradeExpiringTime().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode());
+        result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode());
+        result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
+        result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getExceptionStatus() == null) ? 0 : getExceptionStatus().hashCode());
+        result = prime * result + ((getExceptionMsg() == null) ? 0 : getExceptionMsg().hashCode());
+        result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
+        result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
+        result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", orderNo=").append(orderNo);
+        sb.append(", childOrderNo=").append(childOrderNo);
+        sb.append(", tradeNo=").append(tradeNo);
+        sb.append(", thirdTradeNo=").append(thirdTradeNo);
+        sb.append(", sqtBizOrderId=").append(sqtBizOrderId);
+        sb.append(", merId=").append(merId);
+        sb.append(", merName=").append(merName);
+        sb.append(", userId=").append(userId);
+        sb.append(", userPhone=").append(userPhone);
+        sb.append(", firstBusinessType=").append(firstBusinessType);
+        sb.append(", secondBusinessType=").append(secondBusinessType);
+        sb.append(", entId=").append(entId);
+        sb.append(", img=").append(img);
+        sb.append(", goodsName=").append(goodsName);
+        sb.append(", traceId=").append(traceId);
+        sb.append(", goodsCount=").append(goodsCount);
+        sb.append(", totalPrice=").append(totalPrice);
+        sb.append(", totalDeductionPrice=").append(totalDeductionPrice);
+        sb.append(", couponDiscountPrice=").append(couponDiscountPrice);
+        sb.append(", integralDiscountPrice=").append(integralDiscountPrice);
+        sb.append(", platformCode=").append(platformCode);
+        sb.append(", notifyUrl=").append(notifyUrl);
+        sb.append(", returnUrl=").append(returnUrl);
+        sb.append(", payRealPrice=").append(payRealPrice);
+        sb.append(", entPayAmount=").append(entPayAmount);
+        sb.append(", tradeAmount=").append(tradeAmount);
+        sb.append(", businessDiscountPayAmount=").append(businessDiscountPayAmount);
+        sb.append(", serviceFeeAmount=").append(serviceFeeAmount);
+        sb.append(", servicePrice=").append(servicePrice);
+        sb.append(", payChannel=").append(payChannel);
+        sb.append(", paySerialNo=").append(paySerialNo);
+        sb.append(", payType=").append(payType);
+        sb.append(", status=").append(status);
+        sb.append(", meituanStatus=").append(meituanStatus);
+        sb.append(", staffInfo=").append(staffInfo);
+        sb.append(", businessInfo=").append(businessInfo);
+        sb.append(", tradeExpiringTime=").append(tradeExpiringTime);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", payTime=").append(payTime);
+        sb.append(", cancelTime=").append(cancelTime);
+        sb.append(", refundTime=").append(refundTime);
+        sb.append(", finishTime=").append(finishTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", exceptionStatus=").append(exceptionStatus);
+        sb.append(", exceptionMsg=").append(exceptionMsg);
+        sb.append(", ext1=").append(ext1);
+        sb.append(", ext2=").append(ext2);
+        sb.append(", ext3=").append(ext3);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

service/src/main/java/com/hfkj/meituan/MeiTuanService.java

@@ -22,10 +22,8 @@ import java.util.Map;
  **/
 public class MeiTuanService {
 
-
     private static Logger log = LoggerFactory.getLogger(MeiTuanService.class);
 
-
     /**
      * @MethodName loginFree
      * @Description: H5免登接口

service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java

@@ -262,6 +262,9 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
         if (jsonObjects == null) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂未发货！");
         }
+        if (!jsonObjects.getBoolean("success")) {
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObjects.getString("msg"));
+        }
         System.out.println("======================================" + jsonObjects);
         return editLogistics((JSONObject) jsonObjects.get("data"));
     }

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

@@ -61,14 +61,11 @@ public class OrderRefundSuccessService {
 
     public void goods(BsOrderChild childOrder) {
         // 查询实物订单
-        BsOrderGoods orderGoods = bsOrderGoodsService.findGoodsOrderByChild(childOrder.getOrderNo());
+        BsOrderGoods orderGoods = bsOrderGoodsService.findGoodsOrderByChild(childOrder.getChildOrderNo());
 
         try {
 
             if (orderGoods != null) {
-                Map<String , Object> map = new HashMap<>();
-                map.put("orderNo", childOrder.getOrderNo());
-                CinemaService.refundMovieOrder(map);
                 orderGoods.setStatus(OrderChildStatusEnum.status4.getCode());
                 orderGoods.setLogisticsStatusDesc(null);
                 orderGoods.setLogisticsNo(null);

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

@@ -15,6 +15,7 @@ import com.hfkj.model.order.OrderChildModel;
 import com.hfkj.model.order.OrderModel;
 import com.hfkj.mqtopic.OrderTopic;
 import com.hfkj.qianzhu.CinemaService;
+import com.hfkj.qianzhu.StarbucksService;
 import com.hfkj.service.BsProductConfigService;
 import com.hfkj.service.discount.CouponDiscountService;
 import com.hfkj.service.discount.CouponDiscountUserRelService;
@@ -575,6 +576,8 @@ public class BsOrderServiceImpl implements BsOrderService {
                     childOrderComplete(orderChild.getChildOrderNo());
                 }
             }
+
+
         }
 
         return orderModel;

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

@@ -69,3 +69,8 @@ HgNotifyUrl = 1
 HgApiKey=3fd74e7c16b04681a0f481c5bc0a96d3
 HgMemberId=1622808562621276161
 HgPostUrl=http://113.250.49.100:8088/recharge/
+
+
+haiOilPostUrl = https://oil.dctpay.com
+haiOilAppid = hf166f4b2ed75e71
+haiOilAppSecret = 5a11778cfdd4962282a359397bf4f86b

user/src/main/java/com/user/controller/BsUserController.java

@@ -156,6 +156,50 @@ public class BsUserController {
         }
     }
 
+    @RequestMapping(value = "/phoneNotVerify", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "H5手机号不校验登陆")
+    public ResponseData phoneNotVerify(@RequestBody JSONObject body) {
+        try {
+            if (body == null
+                    || StringUtils.isBlank(body.getString("platform"))
+                    || StringUtils.isBlank(body.getString("type"))
+                    || StringUtils.isBlank(body.getString("phone"))
+            ) {
+                log.error("LoginController --> phone() error!", "请求参数校验失败");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+            }
+            String phone = body.getString("phone");
+            String password = body.getString("password");
+
+            // 客户端
+            UserLoginPlatform platform = UserLoginPlatform.getDataByType(body.getString("platform"));
+            if (platform == null) {
+                log.error("LoginController --> phone() error!", "未知客户端");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知客户端");
+            }
+            // 校验手机号格式
+            if (!MemberValidateUtil.validatePhone(phone)) {
+                log.error("LoginController --> phone() error!", "请输入正确的手机号");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入正确的手机号");
+            }
+            // 登录类型
+            UserLoginType loginType = UserLoginType.getDataByType(body.getString("type"));
+            if (loginType == null) {
+                log.error("LoginController --> phone() error!", "未知登录类型；" + body.getString("type"));
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知登录类型");
+            }
+
+            Map<String, Object> other = new HashMap<>();
+            other.put("maOpenId", "maOpenId");
+            return ResponseMsgUtil.success(userService.login(platform, loginType, phone, password, other));
+
+        } catch (Exception e) {
+            log.error("LoginController --> phone() error!", e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
     @RequestMapping(value = "/phoneTest", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "手机号登录")