springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java
@@ -96,6 +96,15 @@ @ApiModelProperty("支付方式") private String paymentMethod; @ApiModelProperty("商家地址") private String address; @ApiModelProperty("纬度") private String lat; @ApiModelProperty("经度") private String lon; @ApiModelProperty(value = "用户真实ip", hidden = true) private String clientIp; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java
@@ -421,16 +421,16 @@ /** * 完成订单更新/新增商家信息 * @param merchantName * @param orderNo * @param configId * @param userId * @return */ @GetMapping("/updateAfterOrder") public R updateMcsMerchantAfterOrder(@RequestParam(value = "merchantName", required = false) String merchantName, public R updateMcsMerchantAfterOrder(@RequestParam(value = "orderNo") String orderNo, @RequestParam("configId") Long configId, @RequestParam("userId") Long userId) { return mcsMerchantService.updateOrAddMcsMerchantAfterOrder(merchantName, configId, userId); return mcsMerchantService.updateOrAddMcsMerchantAfterOrder(orderNo, configId, userId); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsOrder.java
@@ -93,4 +93,17 @@ private String merchantName; private String paymentMethod; /** * 商家地址 */ private String address; /** * 纬度 */ private String lat; /** * 经度 */ private String lon; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsMerchantService.java
@@ -70,12 +70,12 @@ /** * 完成订单更新/新增商家信息 * * @param merchantName * @param orderNo * @param configId * @param userId * @return */ R updateOrAddMcsMerchantAfterOrder(String merchantName, Long configId, Long userId); R updateOrAddMcsMerchantAfterOrder(String orderNo, Long configId, Long userId); /** * 验证码登录 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
@@ -20,6 +20,8 @@ import com.panzhihua.common.model.vos.community.microCommercialStreet.McsGameVO; import com.panzhihua.common.model.vos.community.microCommercialStreet.McsLoginUserInfoVO; import com.panzhihua.service_community.dao.McsInformationDAO; import com.panzhihua.service_community.dao.McsOrderDao; import com.panzhihua.service_community.entity.McsOrder; import com.panzhihua.service_community.util.NearbyUtil; import com.spatial4j.core.shape.Rectangle; import org.springframework.beans.BeanUtils; @@ -73,6 +75,8 @@ private McsInformationDAO mcsInformationDAO; @Resource private StringRedisTemplate stringRedisTemplate; @Resource private McsOrderDao mcsOrderDao; /** * 新增数字商业街商家 @@ -243,13 +247,17 @@ /** * 完成订单更新/新增商家信息 * * @param merchantName * @param orderNo * @param configId * @param userId * @return */ @Override public R updateOrAddMcsMerchantAfterOrder(String merchantName, Long configId, Long userId) { public R updateOrAddMcsMerchantAfterOrder(String orderNo, Long configId, Long userId) { McsOrder mcsOrder = mcsOrderDao.selectOne(new QueryWrapper<McsOrder>().lambda().eq(McsOrder::getOrderNo, orderNo)); if (isNull(mcsOrder)) { return R.fail("订单不存在"); } McsMerchant mcsMerchant = this.baseMapper.selectOne(new QueryWrapper<McsMerchant>().lambda().eq(McsMerchant::getUserId, userId)); McsConfig mcsConfig = mcsConfigDAO.selectById(configId); if (isNull(mcsConfig) || isBlank(mcsConfig.getValue())) { @@ -260,6 +268,7 @@ return R.fail("配置有误"); } Integer litDays = (Integer)packageObject.get("day"); String merchantName = mcsOrder.getMerchantName(); Date nowDate = new Date(); int num; if (isNull(mcsMerchant)) { @@ -279,6 +288,9 @@ mcsMerchant.setUserId(userId); mcsMerchant.setCreatedBy(userId); mcsMerchant.setUpdatedBy(userId); mcsMerchant.setAddress(mcsOrder.getAddress()); mcsMerchant.setLat(mcsOrder.getLat()); mcsMerchant.setLon(mcsOrder.getLon()); num = this.baseMapper.insert(mcsMerchant); McsMerchantDTO mcsMerchantDTO = new McsMerchantDTO(); mcsMerchantDTO.setName(mcsMerchant.getName()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
@@ -147,7 +147,7 @@ mcsOrderBase.setPaymentMethod("微信支付"); int i=this.baseMapper.updateById(mcsOrderBase); if(i>0){ R r = mcsMerchantService.updateOrAddMcsMerchantAfterOrder(mcsOrderBase.getMerchantName(), mcsOrderBase.getConfigId(), mcsOrderBase.getUserId()); R r = mcsMerchantService.updateOrAddMcsMerchantAfterOrder(mcsOrderBase.getOrderNo(), mcsOrderBase.getConfigId(), mcsOrderBase.getUserId()); if (R.isOk(r) && nonNull(r.getData())) { mcsOrderBase.setMerchantId(JSONObject.parseObject(JSONObject.toJSONString(r.getData()), Long.class)); this.baseMapper.updateById(mcsOrderBase); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsOrderMapper.xml
@@ -14,6 +14,9 @@ <result property="payNo" column="pay_no"/> <result property="userId" column="user_id"/> <result property="paymentMethod" column="payment_method"/> <result property="address" column="address"/> <result property="lat" column="lat"/> <result property="lon" column="lon"/> </resultMap> <select id="pageList" resultType="com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO">
